From c430824a0695d95416c7477f05657a8ba0fcbf8d Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 23 Sep 2020 12:23:42 +0200 Subject: [PATCH] haskellPackages.pandoc: Fix build --- .../haskell-modules/configuration-common.nix | 2 +- .../configuration-hackage2nix.yaml | 1 + .../haskell-modules/hackage-packages.nix | 24 +++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a23306b8fa97..0d170f0e1e47 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1461,7 +1461,7 @@ self: super: { jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2; pandoc = doDistribute self.pandoc_2_10_1; pandoc-citeproc = doDistribute self.pandoc-citeproc_0_17_0_2; - pandoc-types = doDistribute self.pandoc-types_1_22; + pandoc-types = doDistribute self.pandoc-types_1_21; rfc5051 = doDistribute self.rfc5051_0_2; # Upstream forgot to change the Cabal version bounds in the test suite. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 40776fb73eb4..d474d45d7aaf 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2589,6 +2589,7 @@ extra-packages: - network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below - network == 3.0.* # required by network-bsd, HTTP, and many others (2019-04-30) - ormolu == 0.0.5.0 # required by haskell-language-server + - pandoc-types == 1.21 # required by for pandoc_2_10_1 - pantry == 0.2.0.0 # required by stack-2.1.3.1 - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 - patience ^>= 0.1 # required by chell-0.4.x diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 88da4767fbb2..82eaebd4d032 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -190768,6 +190768,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-types_1_21" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, transformers + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.21"; + sha256 = "1wbb0hhjiw0b66kj1ck3qipwgdac5v7qvjaqszsz5fll3cqp4sna"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim QuickCheck syb + text transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit QuickCheck string-qq syb + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Types for representing a structured document"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-types_1_22" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb