haskell.packages.*: reflect Cabal minor version update

main
sternenseemann 3 years ago
parent 21910c199d
commit 2fb806dba0
  1. 2
      pkgs/development/haskell-modules/configuration-common.nix
  2. 6
      pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
  3. 4
      pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
  4. 2
      pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
  5. 2
      pkgs/top-level/release-haskell.nix

@ -1990,7 +1990,7 @@ EOT
# Needs Cabal >= 3.4
chs-cabal = super.chs-cabal.override {
Cabal = self.Cabal_3_6_1_0;
Cabal = self.Cabal_3_6_2_0;
};
# 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.

@ -44,15 +44,15 @@ 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_1_0;
Cabal = self.Cabal_3_6_2_0;
});
# cabal-install-parsers is written for Cabal 3.6
cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_1_0; };
cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_2_0; };
# older version of cabal-install-parsers for reverse dependencies that use Cabal 3.4
cabal-install-parsers_0_4_2 = super.cabal-install-parsers_0_4_2.override {
Cabal = self.Cabal_3_4_0_0;
Cabal = self.Cabal_3_4_1_0;
};
# Jailbreak to fix the build.

@ -51,7 +51,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_1_0;
Cabal = self.Cabal_3_6_2_0;
});
# Ignore overly restrictive upper version bounds.
@ -98,7 +98,7 @@ self: super: {
darcs = dontDistribute super.darcs;
# The package needs the latest Cabal version.
cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_1_0; });
cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_2_0; });
# cabal-fmt requires Cabal3
cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; };

@ -45,7 +45,7 @@ self: super: {
# cabal-install needs more recent versions of Cabal and base16-bytestring.
cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
Cabal = self.Cabal_3_6_1_0;
Cabal = self.Cabal_3_6_2_0;
});
# Jailbreaks & Version Updates

@ -305,7 +305,7 @@ let
# package sets (like Cabal, jailbreak-cabal) are
# working as expected.
cabal-install = all;
Cabal_3_6_1_0 = with compilerNames; [ ghc884 ghc8107 ghc901 ghc921 ];
Cabal_3_6_2_0 = with compilerNames; [ ghc884 ghc8107 ghc901 ghc921 ];
cabal2nix-unstable = all;
funcmp = all;
haskell-language-server = all;

Loading…
Cancel
Save