diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2019-02-24 10:15:37 +0100 |
|---|---|---|
| committer | Sarah Brofeldt <sbrofeldt@gmail.com> | 2019-02-24 10:15:37 +0100 |
| commit | aa88d65e28ad346d14854a8f0c6dfe1cd1fc9dd3 (patch) | |
| tree | 51b3ab841ed23287cd38ad249c4fd72dc604c8e3 /pkgs/top-level | |
| parent | 1f2d0a356948316453a5f83be0fc6e603c311cbf (diff) | |
| parent | 374115a81c707817cd1d9f43a38635fdd0fa20f5 (diff) | |
| download | nixlib-aa88d65e28ad346d14854a8f0c6dfe1cd1fc9dd3.tar nixlib-aa88d65e28ad346d14854a8f0c6dfe1cd1fc9dd3.tar.gz nixlib-aa88d65e28ad346d14854a8f0c6dfe1cd1fc9dd3.tar.bz2 nixlib-aa88d65e28ad346d14854a8f0c6dfe1cd1fc9dd3.tar.lz nixlib-aa88d65e28ad346d14854a8f0c6dfe1cd1fc9dd3.tar.xz nixlib-aa88d65e28ad346d14854a8f0c6dfe1cd1fc9dd3.tar.zst nixlib-aa88d65e28ad346d14854a8f0c6dfe1cd1fc9dd3.zip | |
Merge #56008
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d137b545f48..b7c5eee68473 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4736,13 +4736,6 @@ in pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: { configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; - # 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 { }; |