From 8094b8a95331c97552e3eae54e2ebbeb6e0e2326 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 8 Oct 2020 14:41:36 +0200 Subject: ikiwiki: add highlight dependency IkiWiki's highlight plugin requires this. Note that the current highlight version (3.57) is not compatible with ikiwiki version in nixpkgs. This will be fixed in the next commit. --- pkgs/applications/misc/ikiwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 0c2abbd9f588..20e271bc58d1 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -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 @@ -31,7 +31,7 @@ stdenv.mkDerivation { sha256 = "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh"; }; - 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 -- cgit v1.2.3 From b06290ffd0c3efe2d9ee0de8f9a6c22336e7f998 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 8 Oct 2020 14:48:22 +0200 Subject: ikiwiki: 3.20190228 -> 3.20200202.3 This fixes (among others) incompatibility with highlight from nixpkgs. See http://source.ikiwiki.branchable.com/?p=source.git;a=commit;h=4d06df9583e6c4145f8c6fc2fd51d7894c0b85ce --- pkgs/applications/misc/ikiwiki/default.nix | 4 +- .../misc/ikiwiki/remove-markdown-tests.patch | 46 +++++++++++----------- 2 files changed, 24 insertions(+), 26 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 20e271bc58d1..105e1d59b36c 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -19,7 +19,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20190228"; + version = "3.20200202.3"; lib = stdenv.lib; in @@ -28,7 +28,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.orig.tar.xz"; - sha256 = "17pyblaqhkb61lxl63bzndiffism8k859p54k3k4sghclq6lsynh"; + sha256 = "0skrc8r4wh4mjfgw1c94awr5sacfb9nfsbm4frikanc9xsy16ksr"; }; buildInputs = [ which highlight ] diff --git a/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch b/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch index c981857a248b..bae63a10bf67 100644 --- a/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch +++ b/pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch @@ -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"), - "

C. S. Lewis wrote books

\n", "alphalist off by default"); +@@ -22,30 +22,13 @@ foreach my $multimarkdown (qw(1 0)) { + "

C. S. Lewis wrote books

\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{

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{

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{

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{

A. One\sB. Two

\n}, "alphalist can be disabled"); - --like(IkiWiki::htmlize("foo", "foo", "mdwn", -- "This works[^1]\n\n[^1]: Sometimes it doesn't.\n"), -- qr{

This works\^1}, "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{

This works Date: Thu, 8 Oct 2020 14:54:19 +0200 Subject: ikiwiki: Fix postInstall script to work with optional dependencies The line-continuation backslash should not be a part of optional string because it can lead to errors like this: /nix/store/333six1faw9bhccsx9qw5718k6b1wiq2-stdenv-linux/setup: line 90: --prefix: command not found builder for '/nix/store/lb07r900fpg7r1555zpf0j8n1n7g3wlx-ikiwiki-3.20200202.3.drv' failed with exit code 127 --- pkgs/applications/misc/ikiwiki/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 105e1d59b36c..c940f824f37a 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -62,13 +62,13 @@ 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.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils} done ''; -- cgit v1.2.3 From 40a5a4c46ed512423685f9ab8ae25ec88d675496 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 8 Oct 2020 15:00:30 +0200 Subject: ikiwiki: Fix docutils support Without this, the rst plugin complains as follows: cannot import docutils.core Also, python3 is needed for the rst plugin to work. --- pkgs/applications/misc/ikiwiki/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/applications') diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index c940f824f37a..c97ea3d4b772 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation { ${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 ''; -- cgit v1.2.3