From 2534dddaa96af8faa442ba7ac360966c7990e773 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 27 Dec 2018 14:39:53 +0100 Subject: [PATCH] pandoc: fix build, unbreaks `metrics` job --- pkgs/top-level/all-packages.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9242686263..93464decff5 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 { };