From c5a806cfc05696ae45a48891e25e10c28b61f104 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 7 Apr 2020 17:39:13 +0200 Subject: [PATCH] haskellPackages.pandoc-crossref: downgrade to latest working --- .../haskell-modules/configuration-common.nix | 1 - .../configuration-hackage2nix.yaml | 4 +- .../haskell-modules/hackage-packages.nix | 40 ++++++++++++++++++- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 120167a874caa..35c0c8b1c2333 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -348,7 +348,6 @@ self: super: { optional = dontCheck super.optional; orgmode-parse = dontCheck super.orgmode-parse; os-release = dontCheck super.os-release; - pandoc-crossref = dontCheck super.pandoc-crossref; # (most likely change when no longer 0.3.2.1) https://github.com/lierdakil/pandoc-crossref/issues/199 persistent-redis = dontCheck super.persistent-redis; pipes-extra = dontCheck super.pipes-extra; pipes-websockets = dontCheck super.pipes-websockets; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 45c5fe9e71889..9b6be4888fc1b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -69,6 +69,9 @@ core-packages: default-package-overrides: # pandoc-2.9 does not accept the 0.3 version yet - doclayout < 0.3 + # latest version does not support pandoc 2.8, remove once 2.9 + # is available in LTS + - pandoc-crossref ==0.3.4.2 # LTS Haskell 14.23 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 @@ -7832,7 +7835,6 @@ broken-packages: - pan-os-syslog - panda - pandoc-citeproc-preamble - - pandoc-crossref - pandoc-include - pandoc-include-code - pandoc-japanese-filters diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 309fdd479e2c2..d558e31ff89c7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -181662,8 +181662,44 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.6.1"; - sha256 = "1fk06lg9hx5gdmjf4qsgl4p34y676v33l8yc0hyrdx81v8yicp5m"; + version = "0.3.4.2"; + sha256 = "03bdi57x49rnyi991wzrhqkiz01vv7j9dvc9vwhgfm5x3yhgr0v2"; + 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 = stdenv.lib.licenses.gpl2; + }) {}; + + "pandoc-crossref_0_3_6_2" = 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.6.2"; + sha256 = "055dfbirs3n99crzg9bfnxs96bsfzz6hqjj743dkrvjqmq1qlqc5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true;