b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskell: bump uses of Cabal_3_6_0_0 to Cabal_3_6_1_0 to get rid of eval errors

Browse source
This commit is contained in:
(cdep)illabout 2021-09-11 11:58:02 +09:00
parent 71c958552a
commit 96f6dbbd10
No known key found for this signature in database
GPG key ID: 462E0C03D11422F4
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-common.nix
View file

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

2
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View file

@ -49,7 +49,7 @@ self: super: {
});
# cabal-install-parsers is written for Cabal 3.6
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_6_1_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 {

2
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file

@ -99,7 +99,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_0_0; });
cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_1_0; });
# cabal-fmt requires Cabal3
cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; };

2
pkgs/top-level/release-haskell.nix
View file

@ -300,7 +300,7 @@ let
# package sets (like Cabal, jailbreak-cabal) are
# working as expected.
cabal-install = all;
Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8107 ];
Cabal_3_6_1_0 = with compilerNames; [ ghc884 ghc8107 ];
cabal2nix-unstable = all;
funcmp = all;
# Doesn't currently work on ghc-9.0: