diff options
| author | Michal Sojka <michal.sojka@cvut.cz> | 2021-10-28 11:21:24 +0200 |
|---|---|---|
| committer | Michal Sojka <michal.sojka@cvut.cz> | 2021-10-28 11:38:46 +0200 |
| commit | a2e7a452be8b5bbd63985de3f1f54d74e28e348b (patch) | |
| tree | d28b6dc77c6d2a0002ca27159d8713099ac6729b /pkgs/applications/misc/ikiwiki/default.nix | |
| parent | d38e03f307d1a8d4229b38d3e330d8d1af7e6626 (diff) | |
| download | nixpkgs-a2e7a452be8b5bbd63985de3f1f54d74e28e348b.tar nixpkgs-a2e7a452be8b5bbd63985de3f1f54d74e28e348b.tar.gz nixpkgs-a2e7a452be8b5bbd63985de3f1f54d74e28e348b.tar.bz2 nixpkgs-a2e7a452be8b5bbd63985de3f1f54d74e28e348b.tar.lz nixpkgs-a2e7a452be8b5bbd63985de3f1f54d74e28e348b.tar.xz nixpkgs-a2e7a452be8b5bbd63985de3f1f54d74e28e348b.tar.zst nixpkgs-a2e7a452be8b5bbd63985de3f1f54d74e28e348b.zip | |
ikiwiki: Apply upstream fix for highlight-4.0 compatibility
Diffstat (limited to 'pkgs/applications/misc/ikiwiki/default.nix')
| -rw-r--r-- | pkgs/applications/misc/ikiwiki/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 63e960ef8f5..d54ce442f34 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, gettext, makeWrapper, ImageMagick, which, highlight +{ lib, stdenv, fetchurl, fetchpatch, perlPackages, gettext, makeWrapper, ImageMagick, which, highlight , gitSupport ? false, git , docutilsSupport ? false, python, docutils , monotoneSupport ? false, monotone @@ -31,9 +31,17 @@ stdenv.mkDerivation rec { ++ lib.optionals subversionSupport [subversion] ++ lib.optionals mercurialSupport [mercurial]; - # A few markdown tests fail, but this is expected when using Text::Markdown - # instead of Text::Markdown::Discount. - patches = [ ./remove-markdown-tests.patch ]; + patches = [ + # A few markdown tests fail, but this is expected when using Text::Markdown + # instead of Text::Markdown::Discount. + ./remove-markdown-tests.patch + + (fetchpatch { + name = "Catch-up-to-highlight-4.0-API-change"; + url = "http://source.ikiwiki.branchable.com/?p=source.git;a=patch;h=9ea3f9dfe7c0341f4e002b48728b8139293e19d0"; + sha256 = "16s4wvsfclx0a5cm2awr69dvw2vsi8lpm0d7kyl5w0kjlmzfc7h9"; + }) + ]; postPatch = '' sed -i s@/usr/bin/perl@${perlPackages.perl}/bin/perl@ pm_filter mdwn2man |