haskellPackages.cabal-install: Switch Cabal back to 3.4 on older ghcs

This commit is contained in:
Malte Brandy 2021-08-10 13:45:36 +02:00
parent aeb4364bb3
commit 1445bec521
No known key found for this signature in database
GPG Key ID: 226A2D41EF5378C9
4 changed files with 34 additions and 3 deletions

View File

@ -44,12 +44,12 @@ self: super: {
# cabal-install needs more recent versions of Cabal and base16-bytestring.
cabal-install = super.cabal-install.overrideScope (self: super: {
Cabal = self.Cabal_3_6_0_0;
Cabal = self.Cabal_3_4_0_0;
base16-bytestring = self.base16-bytestring_0_1_1_7;
});
# cabal-install-parsers is written for Cabal 3.4
cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_0_0; };
cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_4_0_0; };
# Jailbreak to fix the build.
base-noprelude = doJailbreak super.base-noprelude;

View File

@ -58,7 +58,7 @@ self: super: {
# cabal-install needs more recent versions of Cabal and random, but an older
# version of base16-bytestring.
cabal-install = super.cabal-install.overrideScope (self: super: {
Cabal = self.Cabal_3_6_0_0;
Cabal = self.Cabal_3_4_0_0;
base16-bytestring = self.base16-bytestring_0_1_1_7;
});

View File

@ -97,6 +97,7 @@ extra-packages:
- Cabal == 2.2.* # required for jailbreak-cabal etc.
- Cabal == 2.4.* # required for cabal-install etc.
- Cabal == 3.2.* # required for cabal-install etc.
- Cabal == 3.4.* # required for cabal-install etc.
- dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
- dhall == 1.29.0 # required for ats-pkg

View File

@ -2732,6 +2732,36 @@ self: {
hydraPlatforms = lib.platforms.none;
}) {};
"Cabal_3_4_0_0" = callPackage
({ mkDerivation, array, async, base, base-compat, base-orphans
, binary, bytestring, clock, containers, deepseq, Diff, directory
, filepath, integer-logarithms, mtl, optparse-applicative, parsec
, pretty, process, QuickCheck, rere, stm, tagged, tar, tasty
, tasty-golden, tasty-hunit, tasty-quickcheck, temporary, text
, time, transformers, tree-diff, unix
}:
mkDerivation {
pname = "Cabal";
version = "3.4.0.0";
sha256 = "1za1cl14fkw8y89hhw6sqirzmkixjaa4wpqsibyk0fvnjs59jydq";
setupHaskellDepends = [ mtl parsec ];
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
mtl parsec pretty process text time transformers unix
];
testHaskellDepends = [
array async base base-compat base-orphans binary bytestring clock
containers deepseq Diff directory filepath integer-logarithms
optparse-applicative pretty process QuickCheck rere stm tagged tar
tasty tasty-golden tasty-hunit tasty-quickcheck temporary text
transformers tree-diff
];
doCheck = false;
description = "A framework for packaging Haskell software";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"Cabal_3_6_0_0" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, deepseq, directory, filepath, mtl, parsec, pretty, process, text