Merge pull request #100033 from wentasah/ikiwiki

This commit is contained in:
Sandro 2020-11-28 00:40:24 +01:00 committed by GitHub
commit a005d724d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 35 deletions

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which
{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight
, gitSupport ? false, git ? null
, docutilsSupport ? false, python ? null, docutils ? null
, monotoneSupport ? false, monotone ? null
@ -19,7 +19,7 @@ assert mercurialSupport -> (mercurial != null);
let
name = "ikiwiki";
version = "3.20190228";
version = "3.20200202.3";
lib = stdenv.lib;
in
@ -28,10 +28,10 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz";
sha256 = "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh";
sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr";
};
buildInputs = [ which ]
buildInputs = [ which highlight ]
++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase
@ -62,13 +62,14 @@ stdenv.mkDerivation {
postInstall = ''
for a in "$out/bin/"*; do
wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \
${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''}
${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''}
${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin \''}
${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''}
${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''}
${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin \''}
${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin \''}
${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin ''} \
${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin ''} \
${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin ''} \
${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin ''} \
${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin ''} \
${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin ''} \
${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \
${lib.optionalString docutilsSupport ''--prefix PYTHONPATH : "$(toPythonPath ${docutils})" ''} \
${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
done
'';

View file

@ -1,10 +1,28 @@
diff --git a/t/mdwn.t b/t/mdwn.t
index ca3180139..d64750403 100755
index 966aad2..2756173 100755
--- a/t/mdwn.t
+++ b/t/mdwn.t
@@ -16,32 +16,17 @@ is(IkiWiki::htmlize("foo", "foo", "mdwn",
"C. S. Lewis wrote books\n"),
"<p>C. S. Lewis wrote books</p>\n", "alphalist off by default");
@@ -22,30 +22,13 @@ foreach my $multimarkdown (qw(1 0)) {
"<p>C. S. Lewis wrote books</p>\n",
"alphalist off by default for multimarkdown = $multimarkdown");
- like(IkiWiki::htmlize("foo", "foo", "mdwn",
- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
- qr{<p>This works.*fnref:1.*},
- "footnotes on by default for multimarkdown = $multimarkdown");
-
$config{mdwn_footnotes} = 0;
unlike(IkiWiki::htmlize("foo", "foo", "mdwn",
"An unusual link label: [^1]\n\n[^1]: http://example.com/\n"),
qr{<p>An unusual link label: .*fnref:1.*},
"footnotes can be disabled for multimarkdown = $multimarkdown");
-
- $config{mdwn_footnotes} = 1;
- like(IkiWiki::htmlize("foo", "foo", "mdwn",
- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
- qr{<p>This works.*fnref:1.*},
- "footnotes can be enabled for multimarkdown = $multimarkdown");
}
-$config{mdwn_alpha_lists} = 1;
-like(IkiWiki::htmlize("foo", "foo", "mdwn",
@ -15,23 +33,3 @@ index ca3180139..d64750403 100755
$config{mdwn_alpha_lists} = 0;
like(IkiWiki::htmlize("foo", "foo", "mdwn",
"A. One\n".
"B. Two\n"),
qr{<p>A. One\sB. Two</p>\n}, "alphalist can be disabled");
-like(IkiWiki::htmlize("foo", "foo", "mdwn",
- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
- qr{<p>This works<sup\W}, "footnotes on by default");
-
$config{mdwn_footnotes} = 0;
like(IkiWiki::htmlize("foo", "foo", "mdwn",
"An unusual link label: [^1]\n\n[^1]: http://example.com/\n"),
qr{<a href="http://example\.com/">\^1</a>}, "footnotes can be disabled");
-$config{mdwn_footnotes} = 1;
-like(IkiWiki::htmlize("foo", "foo", "mdwn",
- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
- qr{<p>This works<sup\W}, "footnotes can be enabled");
-
SKIP: {
skip 'set $IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT if you have Discount 2.2.0+', 4
unless $ENV{IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT};

View file

@ -21817,6 +21817,7 @@ in
ike = callPackage ../applications/networking/ike { };
ikiwiki = callPackage ../applications/misc/ikiwiki {
python = python3;
inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick;
};