Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c40ba614a148
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a005d724d052
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 8, 2020

  1. 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.
    @wentasah
    wentasah committed Oct 8, 2020
    Copy the full SHA
    8094b8a View commit details

  2. 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
    @wentasah
    wentasah committed Oct 8, 2020
    Copy the full SHA
    b06290f View commit details

  3. 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
    @wentasah
    wentasah committed Oct 8, 2020
    Copy the full SHA
    7e63308 View commit details

  4. 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.
    @wentasah
    wentasah committed Oct 8, 2020
    Copy the full SHA
    40a5a4c View commit details

Commits on Nov 27, 2020

  1. Merge pull request #100033 from wentasah/ikiwiki

    @SuperSandro2000
    SuperSandro2000 authored Nov 27, 2020
    Copy the full SHA
    a005d72 View commit details
Showing with 35 additions and 35 deletions.
  1. +12 −11 pkgs/applications/misc/ikiwiki/default.nix
  2. +22 −24 pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch
  3. +1 −0 pkgs/top-level/all-packages.nix
23 changes: 12 additions & 11 deletions pkgs/applications/misc/ikiwiki/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
'';
46 changes: 22 additions & 24 deletions pkgs/applications/misc/ikiwiki/remove-markdown-tests.patch
View file
Original file line number Diff line number Diff line change
@@ -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};
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};