forked from mirrors/nixpkgs
haskellPackages.{cabal-install, cabal-install-parsers}: use Cabal 3.6.0.0
Try using the latest and greatest version Cabal for cabal-install and cabal-install-parsers, we'll see how it goes.
This commit is contained in:
parent
14467d1735
commit
124d658eff
|
@ -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_4_0_0;
|
||||
Cabal = self.Cabal_3_6_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_4_0_0; };
|
||||
cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_0_0; };
|
||||
|
||||
# Jailbreak to fix the build.
|
||||
base-noprelude = doJailbreak super.base-noprelude;
|
||||
|
|
|
@ -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_4_0_0;
|
||||
Cabal = self.Cabal_3_6_0_0;
|
||||
base16-bytestring = self.base16-bytestring_0_1_1_7;
|
||||
});
|
||||
|
||||
|
|
|
@ -300,7 +300,7 @@ let
|
|||
# package sets (like Cabal, jailbreak-cabal) are
|
||||
# working as expected.
|
||||
cabal-install = all;
|
||||
Cabal_3_4_0_0 = with compilerNames; [ ghc884 ghc8104 ];
|
||||
Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8104 ];
|
||||
cabal2nix-unstable = all;
|
||||
funcmp = all;
|
||||
# Doesn't currently work on ghc-9.0:
|
||||
|
|
Loading…
Reference in a new issue