git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #100033 from wentasah/ikiwiki
commita005d724d052601a76373a43a9a1b5dde9a614e9 authorSandro <sandro.jaeckel@gmail.com> dateSat 28 Nov 2020, 00:40 (6 years ago) parentc40ba6140a5a4c
3 files changed+35−35
pkgs/applications/misc/ikiwiki/default.nix+12−11 pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch+22−24 pkgs/top-level/all-packages.nix+1
pkgs/applications/misc/ikiwiki/default.nix+12−11
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which
1+{ stdenv, fetchurl, perlPackages, gettext, makeWrapper, PerlMagick, which, highlight
22, gitSupport ? false, git ? null
33, docutilsSupport ? false, python ? null, docutils ? null
44, monotoneSupport ? false, monotone ? null
@@ -19,7 +19,7 @@ assert mercurialSupport -> (mercurial != null);
1919
2020let
2121 name = "ikiwiki";
22− version = "3.20190228";
22+ version = "3.20200202.3";
2323
2424 lib = stdenv.lib;
2525in
@@ -28,10 +28,10 @@ stdenv.mkDerivation {
2828
2929 src = fetchurl {
3030 url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz";
31− sha256 = "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh";
31+ sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr";
3232 };
3333
34− buildInputs = [ which ]
34+ buildInputs = [ which highlight ]
3535 ++ (with perlPackages; [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
3636 TimeDate gettext makeWrapper DBFile CGISession CGIFormBuilder LocaleGettext
3737 RpcXML XMLSimple PerlMagick YAML YAMLLibYAML HTMLTree AuthenPassphrase
@@ -62,13 +62,14 @@ stdenv.mkDerivation {
6262 postInstall = ''
6363 for a in "$out/bin/"*; do
6464 wrapProgram $a --suffix PERL5LIB : $PERL5LIB --prefix PATH : ${perlPackages.perl}/bin:$out/bin \
65− ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin \''}
66− ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin \''}
67− ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin \''}
68− ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''}
69− ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''}
70− ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin \''}
71− ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin \''}
65+ ${lib.optionalString gitSupport ''--prefix PATH : ${git}/bin ''} \
66+ ${lib.optionalString monotoneSupport ''--prefix PATH : ${monotone}/bin ''} \
67+ ${lib.optionalString bazaarSupport ''--prefix PATH : ${breezy}/bin ''} \
68+ ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin ''} \
69+ ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin ''} \
70+ ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin ''} \
71+ ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin ''} \
72+ ${lib.optionalString docutilsSupport ''--prefix PYTHONPATH : "$(toPythonPath ${docutils})" ''} \
7273 ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
7374 done
7475 '';
pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch+22−24
@@ -1,10 +1,28 @@
11diff --git a/t/mdwn.t b/t/mdwn.t
2−index ca3180139..d64750403 100755
2+index 966aad2..2756173 100755
33--- a/t/mdwn.t
44+++ b/t/mdwn.t
5−@@ -16,32 +16,17 @@ is(IkiWiki::htmlize("foo", "foo", "mdwn",
6− "C. S. Lewis wrote books\n"),
7− "<p>C. S. Lewis wrote books</p>\n", "alphalist off by default");
5+@@ -22,30 +22,13 @@ foreach my $multimarkdown (qw(1 0)) {
6+ "<p>C. S. Lewis wrote books</p>\n",
7+ "alphalist off by default for multimarkdown = $multimarkdown");
8+
9+- like(IkiWiki::htmlize("foo", "foo", "mdwn",
10+- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
11+- qr{<p>This works.*fnref:1.*},
12+- "footnotes on by default for multimarkdown = $multimarkdown");
13+-
14+ $config{mdwn_footnotes} = 0;
15+ unlike(IkiWiki::htmlize("foo", "foo", "mdwn",
16+ "An unusual link label: [^1]\n\n[^1]: http://example.com/\n"),
17+ qr{<p>An unusual link label: .*fnref:1.*},
18+ "footnotes can be disabled for multimarkdown = $multimarkdown");
19+-
20+- $config{mdwn_footnotes} = 1;
21+- like(IkiWiki::htmlize("foo", "foo", "mdwn",
22+- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
23+- qr{<p>This works.*fnref:1.*},
24+- "footnotes can be enabled for multimarkdown = $multimarkdown");
25+ }
826
927-$config{mdwn_alpha_lists} = 1;
1028-like(IkiWiki::htmlize("foo", "foo", "mdwn",
@@ -15,23 +33,3 @@ index ca3180139..d64750403 100755
1533 $config{mdwn_alpha_lists} = 0;
1634 like(IkiWiki::htmlize("foo", "foo", "mdwn",
1735 "A. One\n".
18− "B. Two\n"),
19− qr{<p>A. One\sB. Two</p>\n}, "alphalist can be disabled");
20−
21−-like(IkiWiki::htmlize("foo", "foo", "mdwn",
22−- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
23−- qr{<p>This works<sup\W}, "footnotes on by default");
24−-
25− $config{mdwn_footnotes} = 0;
26− like(IkiWiki::htmlize("foo", "foo", "mdwn",
27− "An unusual link label: [^1]\n\n[^1]: http://example.com/\n"),
28− qr{<a href="http://example\.com/">\^1</a>}, "footnotes can be disabled");
29−
30−-$config{mdwn_footnotes} = 1;
31−-like(IkiWiki::htmlize("foo", "foo", "mdwn",
32−- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"),
33−- qr{<p>This works<sup\W}, "footnotes can be enabled");
34−-
35− SKIP: {
36− skip 'set $IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT if you have Discount 2.2.0+', 4
37− unless $ENV{IKIWIKI_TEST_ASSUME_MODERN_DISCOUNT};
pkgs/top-level/all-packages.nix+1
@@ -21817,6 +21817,7 @@ in
2181721817 ike = callPackage ../applications/networking/ike { };
2181821818
2181921819 ikiwiki = callPackage ../applications/misc/ikiwiki {
21820+ python = python3;
2182021821 inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick;
2182121822 };
2182221823