about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-12-27 14:39:53 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2018-12-27 14:42:07 +0100
commit2534dddaa96af8faa442ba7ac360966c7990e773 (patch)
tree46f06bbac34331a52ea62a359123e5223322a746 /pkgs/top-level
parentb8f0e2ee2fd4f47678a7f8daa291cdcb7fda8d75 (diff)
downloadnixlib-2534dddaa96af8faa442ba7ac360966c7990e773.tar
nixlib-2534dddaa96af8faa442ba7ac360966c7990e773.tar.gz
nixlib-2534dddaa96af8faa442ba7ac360966c7990e773.tar.bz2
nixlib-2534dddaa96af8faa442ba7ac360966c7990e773.tar.lz
nixlib-2534dddaa96af8faa442ba7ac360966c7990e773.tar.xz
nixlib-2534dddaa96af8faa442ba7ac360966c7990e773.tar.zst
nixlib-2534dddaa96af8faa442ba7ac360966c7990e773.zip
pandoc: fix build, unbreaks `metrics` job
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b92426862637..93464decff52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4710,6 +4710,13 @@ in
       mkdir -p $out/share/man/man1
       cp man/pandoc.1 $out/share/man/man1/
     '';
+    # Newer tasty version works
+    # https://github.com/jgm/pandoc/commit/3bf398b15ff28a39133a8ce27ba3d2728d255b17#diff-d37211f38c72504621b9d03eef12ffd7
+    # Note the patch doesn't apply because we fetch the cabal file from elsewhere
+    # This should be removed with pandoc 2.6.
+    postPatch = ''
+      substituteInPlace pandoc.cabal --replace "tasty >= 0.11 && < 1.2" "tasty >= 0.11 && < 1.3"
+    '';
   });
 
   pamtester = callPackage ../tools/security/pamtester { };