diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-10 15:18:19 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-10 15:18:19 +0100 |
| commit | afabc4a15d5ba6631bd4d865b8be37fc67d52809 (patch) | |
| tree | 2342d9e8bd8b4cfbfee2b9a98c088df9f1c809ca /pkgs/development/tools/pandoc/default.nix | |
| parent | 9a0c85ffc5aedc46b4d81f3b9fc22d7f488e3ff9 (diff) | |
| parent | 714e527a726c9613fca8e13586a1b19198d68d9b (diff) | |
| download | nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.gz nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.bz2 nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.lz nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.xz nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.tar.zst nixlib-afabc4a15d5ba6631bd4d865b8be37fc67d52809.zip | |
Merge remote-tracking branch 'origin/master' into HEAD
Conflicts: pkgs/development/libraries/SDL2/default.nix
Diffstat (limited to 'pkgs/development/tools/pandoc/default.nix')
| -rw-r--r-- | pkgs/development/tools/pandoc/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix index 528a1b3f5355..c8c553afad6e 100644 --- a/pkgs/development/tools/pandoc/default.nix +++ b/pkgs/development/tools/pandoc/default.nix @@ -33,6 +33,9 @@ in remove-references-to \ -t ${haskellPackages.warp} \ $out/bin/pandoc + remove-references-to \ + -t ${haskellPackages.pandoc_3_1_8} \ + $out/bin/pandoc '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' mkdir -p $out/share/bash-completion/completions $out/bin/pandoc --bash-completion > $out/share/bash-completion/completions/pandoc @@ -45,5 +48,5 @@ in # lead to a transitive runtime dependency on the whole GHC distribution. # This should ideally be fixed in haskellPackages (or even Cabal), # but a minimal pandoc is important enough to patch it manually. - disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp ]; + disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc_3_1_8 ]; }) |