diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7beaaf8e70c7..8b3871e3220b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1223,9 +1223,16 @@ self: super: { # The test suite depends on an impure cabal-install installation in # $HOME, which we don't have in our build sandbox. - cabal-install-parsers = dontCheck (super.cabal-install-parsers.override { - Cabal = self.Cabal_3_6_3_0; - }); + cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override { + Cabal-syntax = self.Cabal-syntax_3_8_1_0; + })); + cabal-install-parsers_0_4_5 = doDistribute ( + dontCheck ( + super.cabal-install-parsers_0_4_5.override { + Cabal = self.Cabal_3_6_3_0; + } + ) + ); # 2022-03-12: Pick patches from master for compat with Stackage Nightly gitit = appendPatches [ @@ -2022,6 +2029,7 @@ self: super: { haskell-ci = super.haskell-ci.overrideScope (self: super: { Cabal = self.Cabal_3_6_3_0; ShellCheck = self.ShellCheck_0_7_2; + cabal-install-parsers = self.cabal-install-parsers_0_4_5; }); # Build haskell-ci from git repository diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 21676e0d9f1c..cb86dec38db7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -152,6 +152,7 @@ extra-packages: - brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0 - basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10 - foundation < 0.0.29 # 2022-08-30: last version to support GHC < 8.10 + - cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f3ef572d4179..eead19718de3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -52150,6 +52150,35 @@ self: { broken = true; }) {}; + "cabal-install-parsers_0_4_5" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring + , binary, binary-instances, bytestring, Cabal, containers + , criterion, cryptohash-sha256, deepseq, directory, filepath, lukko + , network-uri, parsec, pretty, tar, tasty, tasty-golden + , tasty-hunit, text, time, transformers, tree-diff + }: + mkDerivation { + pname = "cabal-install-parsers"; + version = "0.4.5"; + sha256 = "0gdqr7ib22h6qfvkv179xm4s2lw6fj62y7hj5lg53zjkc7y8791j"; + libraryHaskellDepends = [ + aeson base base16-bytestring binary binary-instances bytestring + Cabal containers cryptohash-sha256 deepseq directory filepath lukko + network-uri parsec pretty tar text time transformers + ]; + testHaskellDepends = [ + ansi-terminal base base16-bytestring bytestring Cabal containers + directory filepath pretty tar tasty tasty-golden tasty-hunit + tree-diff + ]; + benchmarkHaskellDepends = [ + base bytestring Cabal containers criterion directory filepath + ]; + description = "Utilities to work with cabal-install files"; + license = "GPL-2.0-or-later AND BSD-3-Clause"; + hydraPlatforms = lib.platforms.none; + }) {}; + "cabal-install-parsers" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring , binary, binary-instances, bytestring, Cabal-syntax, containers