From 24a4c65ca97e8f474e7af35c67fb1fce5a1c1f55 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 5 Jun 2021 12:59:38 +0200 Subject: [PATCH] haskellPackages.pandoc-crossref: downgrade to retain pandoc 2.13 support --- .../configuration-hackage2nix/main.yaml | 2 + .../haskell-modules/hackage-packages.nix | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 3cdb1b4b7dd7..58ba5ec683e7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -91,6 +91,8 @@ default-package-overrides: - hls-explicit-imports-plugin < 1.0.0.2 # 2021-05-12: remove once versions >= 5.0.0 is in stackage - futhark < 0.19.5 + # 2021-06-05: remove once pandoc 2.14 is in stackage + - pandoc-crossref < 0.3.11.0 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c10984beff3c..002629c61fd3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -194042,6 +194042,44 @@ self: { }) {}; "pandoc-crossref" = callPackage + ({ mkDerivation, base, containers, data-accessor + , data-accessor-template, data-accessor-transformers, data-default + , deepseq, directory, filepath, gitrev, hspec, mtl, open-browser + , optparse-applicative, pandoc, pandoc-types, roman-numerals, syb + , template-haskell, temporary, text, utility-ht + }: + mkDerivation { + pname = "pandoc-crossref"; + version = "0.3.10.0"; + sha256 = "1yymm8y9hzkbjff7cn63qsvpfks1f1n741vfdiiga66kml8v0zdm"; + revision = "1"; + editedCabalFile = "0grjcp8r5fh41qnn3miw6bms3ml9v6n1rjb2yvimf1v69w61nlgq"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers data-accessor data-accessor-template + data-accessor-transformers data-default directory filepath mtl + pandoc pandoc-types roman-numerals syb template-haskell text + utility-ht + ]; + executableHaskellDepends = [ + base containers data-accessor data-accessor-template + data-accessor-transformers data-default deepseq directory filepath + gitrev mtl open-browser optparse-applicative pandoc pandoc-types + roman-numerals syb template-haskell temporary text utility-ht + ]; + testHaskellDepends = [ + base containers data-accessor data-accessor-template + data-accessor-transformers data-default directory filepath hspec + mtl pandoc pandoc-types roman-numerals syb template-haskell text + utility-ht + ]; + description = "Pandoc filter for cross-references"; + license = lib.licenses.gpl2Only; + }) {}; + + "pandoc-crossref_0_3_11_0" = callPackage ({ mkDerivation, base, containers, criterion, data-accessor , data-accessor-template, data-accessor-transformers, data-default , deepseq, directory, filepath, gitrev, hspec, mtl, open-browser @@ -194075,6 +194113,7 @@ self: { doHaddock = false; description = "Pandoc filter for cross-references"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; }) {}; "pandoc-csv2table" = callPackage