From dd91ca469c39913e08a6f68d70bceebe654a66af Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 21 Sep 2025 14:32:25 +0200 Subject: [PATCH] haskellPackages.pandoc-crossref: revert patch requiring pandoc>=3.8 - The linked issue has been resolved, but the updated bounds are only available on master. - 0.3.21 contains a patch for an interface deprecation in pandoc 3.8 which we need to revert in order to build with pandoc 3.7. (cherry picked from commit f2b98de78a3a2967cf011f10beacef2088daf0f2) --- .../haskell-modules/configuration-common.nix | 20 +++++++++++++++++-- .../configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 610e00ae0f96..b0e1766b4ac8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -866,8 +866,24 @@ with haskellLib; }) super.xml-picklers; # 2025-08-03: Too strict bounds on open-browser, data-default and containers - # https://github.com/lierdakil/pandoc-crossref/issues/478 - pandoc-crossref = doJailbreak super.pandoc-crossref; + # https://github.com/lierdakil/pandoc-crossref/issues/478 krank:ignore-line + pandoc-crossref = lib.pipe super.pandoc-crossref [ + (warnAfterVersion "0.3.21") + doJailbreak + + # We are still using pandoc == 3.7.* + (appendPatch ( + lib.warnIf (lib.versionAtLeast self.pandoc.version "3.8") + "haskellPackages.pandoc-crossref: remove revert of pandoc-3.8 patch" + pkgs.fetchpatch + { + name = "pandoc-crossref-revert-pandoc-3.8-highlight.patch"; + url = "https://github.com/lierdakil/pandoc-crossref/commit/b0c35a59d5a802f6525407bfeb31699ffd0b4671.patch"; + hash = "sha256-MIITL9Qr3+1fKf1sTwHzXPcYTt3YC+vr9CpMgqsBXlc="; + revert = true; + } + )) + ]; # Too strict upper bound on data-default-class (< 0.2) # https://github.com/stackbuilders/dotenv-hs/issues/203 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 615ffb5c480d..b4fcad9292d2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4561,7 +4561,6 @@ broken-packages: - pan-os-syslog # failure in job https://hydra.nixos.org/build/233244422 at 2023-09-02 - pandoc-citeproc # failure in job https://hydra.nixos.org/build/233198462 at 2023-09-02 - pandoc-columns # failure in job https://hydra.nixos.org/build/233234538 at 2023-09-02 - - pandoc-crossref # failure in job https://hydra.nixos.org/build/307611190 at 2025-09-19 - pandoc-csv2table # failure in job https://hydra.nixos.org/build/233229925 at 2023-09-02 - pandoc-dhall-decoder # failure in job https://hydra.nixos.org/build/307611186 at 2025-09-19 - pandoc-emphasize-code # failure in job https://hydra.nixos.org/build/252733347 at 2024-03-16 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8f3e6594bd5f..649e211b6907 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -500276,9 +500276,7 @@ self: { doHaddock = false; description = "Pandoc filter for cross-references"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; mainProgram = "pandoc-crossref"; - broken = true; } ) { };