From 8a78846761883e12044efbada6702efdecfa263d Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 2 Nov 2025 22:57:58 +0100 Subject: [PATCH] haskellPackages.pandoc-crossref: pin to 0.3.21 --- .../haskell-modules/configuration-common.nix | 2 + .../configuration-hackage2nix/main.yaml | 3 + .../haskell-modules/hackage-packages.nix | 97 +++++++++++++++++++ 3 files changed, 102 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 88b27c07d28c..2037e2a07b9c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -812,6 +812,8 @@ with haskellLib; }) super.xml-picklers; pandoc-crossref = lib.pipe super.pandoc-crossref [ + # https://github.com/lierdakil/pandoc-crossref/issues/492 + doJailbreak # We are still using pandoc == 3.7.* (appendPatch ( lib.warnIf (lib.versionAtLeast self.pandoc.version "3.8") diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 43f36a13a682..8fa57f8401d9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -40,6 +40,9 @@ default-package-overrides: - liquidhaskell-boot == 0.9.10.* # Needs to match microlens == 0.4.* in Stackage LTS 24 - microlens-pro < 0.2.0.4 + # We currently use pandoc-crossref with a patch to revert it to pandoc == 3.7.*, + # this no longer works with later versions. + - pandoc-crossref == 0.3.21 # keep-sorted end # keep-sorted start skip_lines=1 case=no numeric=yes diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4d3c29da8a95..b3b5f4c230c2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -501119,6 +501119,102 @@ self: { ) { }; pandoc-crossref = callPackage ( + { + mkDerivation, + base, + containers, + criterion, + data-default, + deepseq, + directory, + filepath, + gitrev, + hspec, + microlens, + microlens-ghc, + microlens-mtl, + microlens-th, + mtl, + open-browser, + optparse-applicative, + pandoc, + pandoc-cli, + pandoc-types, + syb, + template-haskell, + temporary, + text, + utility-ht, + }: + mkDerivation { + pname = "pandoc-crossref"; + version = "0.3.21"; + sha256 = "1srfkh987jx3ha8p5yrvy4pxkkypcajb4wvzbnf8sbd4wc2vichh"; + revision = "2"; + editedCabalFile = "1j9s9r6xmw8wq48y73q6w87v92wc5p9va38k5csy28hyix9xf32i"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base + containers + data-default + directory + filepath + microlens + microlens-ghc + microlens-mtl + microlens-th + mtl + pandoc + pandoc-types + syb + template-haskell + text + utility-ht + ]; + executableHaskellDepends = [ + base + deepseq + gitrev + open-browser + optparse-applicative + pandoc + pandoc-types + template-haskell + temporary + text + ]; + testHaskellDepends = [ + base + containers + data-default + directory + filepath + hspec + microlens + microlens-mtl + mtl + pandoc + pandoc-types + text + ]; + testToolDepends = [ pandoc-cli ]; + benchmarkHaskellDepends = [ + base + criterion + pandoc + pandoc-types + text + ]; + doHaddock = false; + description = "Pandoc filter for cross-references"; + license = lib.licenses.gpl2Only; + mainProgram = "pandoc-crossref"; + } + ) { }; + + pandoc-crossref_0_3_22 = callPackage ( { mkDerivation, base, @@ -501208,6 +501304,7 @@ self: { doHaddock = false; description = "Pandoc filter for cross-references"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; mainProgram = "pandoc-crossref"; } ) { };