diff options
| author | maralorn <mail@maralorn.de> | 2024-06-26 23:13:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-26 23:13:06 +0200 |
| commit | c66e984bda09e7230ea7b364e677c5ba4f0d36d0 (patch) | |
| tree | 58e931da1dbdb486c2f542af8c4f73fdfde80345 | |
| parent | 3cc4f0d5756964d5e5d0095f7eb6e7b45dc34dfe (diff) | |
| parent | 08c21134cdf4852f251a71bac0b859f9e3237ba2 (diff) | |
Merge pull request #322743 from maralorn/pandoc-polyfill.io-known-bad
pandoc: apply patch removing the usage of polyfill.io in the templates
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e1efb46422a3..fb6f9608b76d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1962,7 +1962,17 @@ self: super: { readline = appendPatch ./patches/readline-fix-for-cabal-3.patch super.readline; # https://github.com/jgm/pandoc/issues/9589 - pandoc = assert super.pandoc.version == "3.1.11.1"; dontCheck super.pandoc; + pandoc = assert super.pandoc.version == "3.1.11.1"; lib.pipe super.pandoc + [ + dontCheck + (appendPatch + (pkgs.fetchpatch { + name = "drop-usage-known-bad-actor-cdn.patch"; + url = "https://github.com/jgm/pandoc/commit/5877ec546df29115163b36de32837f5e08506092.patch"; + hash = "sha256-2ffdL2dS/hHWBjJcIHbae5OdL/VKlHNKUMDHRy3hqvc="; + }) + ) + ]; # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) pandoc-include-code = doJailbreak super.pandoc-include-code; |