pyrox.dev
ikiwiki: Apply upstream fix for highlight-4.0 compatibility
+12
-4
pkgs/applications/misc/ikiwiki/default.nix
+12
-4
pkgs/applications/misc/ikiwiki/default.nix
···
1
-
{ lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, ImageMagick, which, highlight
1
+
{ lib, stdenv, fetchurl, fetchpatch, perlPackages, gettext, makeWrapper, ImageMagick, which, highlight
2
2
, gitSupport ? false, git
3
3
, docutilsSupport ? false, python, docutils
4
4
, monotoneSupport ? false, monotone
···
31
31
++ lib.optionals subversionSupport [subversion]
32
32
++ lib.optionals mercurialSupport [mercurial];
33
33
34
-
# A few markdown tests fail, but this is expected when using Text::Markdown
35
-
# instead of Text::Markdown::Discount.
36
-
patches = [ ./remove-markdown-tests.patch ];
34
+
patches = [
35
+
# A few markdown tests fail, but this is expected when using Text::Markdown
36
+
# instead of Text::Markdown::Discount.
37
+
./remove-markdown-tests.patch
38
+
39
+
(fetchpatch {
40
+
name = "Catch-up-to-highlight-4.0-API-change";
41
+
url = "http://source.ikiwiki.branchable.com/?p=source.git;a=patch;h=9ea3f9dfe7c0341f4e002b48728b8139293e19d0";
42
+
sha256 = "16s4wvsfclx0a5cm2awr69dvw2vsi8lpm0d7kyl5w0kjlmzfc7h9";
43
+
})
44
+
];
37
45
38
46
postPatch = ''
39
47
sed -i s@/usr/bin/perl@${perlPackages.perl}/bin/perl@ pm_filter mdwn2man