diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2a5231aef21..20173aba517 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -7,8 +7,8 @@ self: super: { # Some packages need a non-core version of Cabal. Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6; Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3; - Cabal_1_22_3_0 = dontCheck super.Cabal_1_22_3_0; - cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_3_0; zlib = self.zlib_0_5_4_2; }); + Cabal_1_22_4_0 = dontCheck super.Cabal_1_22_4_0; + cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; zlib = self.zlib_0_5_4_2; }); cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; }); # Break infinite recursions. diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index 556b86f95eb..63506bad419 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -41,7 +41,7 @@ self: super: { transformers = self.transformers_0_4_3_0; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_5_0; process = self.process_1_2_3_0; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_7_5_0; process = self.process_1_2_3_0; }; # Newer versions don't compile. Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index e012cda2da9..e19a69277db 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -38,7 +38,7 @@ self: super: { transformers = self.transformers_0_4_3_0; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = dontCheck self.binary_0_7_5_0; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_5_0; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; }); diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 16257dcc17b..a9e64935faf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -40,7 +40,7 @@ self: super: { xhtml = self.xhtml_3000_2_1; # https://github.com/haskell/cabal/issues/2322 - Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = dontCheck self.binary_0_7_5_0; }; + Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_7_5_0; }; # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_7_5_0; });