diff options
| author | Peter Simons <simons@cryp.to> | 2015-05-18 19:26:56 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-05-18 20:43:59 +0200 |
| commit | c0e2c4809e49dc3954b7994b1052d626cb9ef0c4 (patch) | |
| tree | 266ac42fda0cd63954ac0cb8ee28192e1962e082 | |
| parent | 0197da662d8c5d849d6cb83d2f94193e4b409b69 (diff) | |
| download | nixpkgs-c0e2c4809e49dc3954b7994b1052d626cb9ef0c4.tar nixpkgs-c0e2c4809e49dc3954b7994b1052d626cb9ef0c4.tar.gz nixpkgs-c0e2c4809e49dc3954b7994b1052d626cb9ef0c4.tar.bz2 nixpkgs-c0e2c4809e49dc3954b7994b1052d626cb9ef0c4.tar.lz nixpkgs-c0e2c4809e49dc3954b7994b1052d626cb9ef0c4.tar.xz nixpkgs-c0e2c4809e49dc3954b7994b1052d626cb9ef0c4.tar.zst nixpkgs-c0e2c4809e49dc3954b7994b1052d626cb9ef0c4.zip | |
cabal-install: fix build for GHC 7.0.x and 7.2.x
3 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1f2bbdb6f71..a7b72fa7f9a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -9,6 +9,7 @@ self: super: { 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.override { Cabal = self.Cabal_1_22_3_0; zlib = self.zlib_0_5_4_2; }); + cabal-install_1_18_1_0 = dontCheck (super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; zlib = self.zlib_0_5_4_2; }); # Break infinite recursions. Dust-crypto = dontCheck super.Dust-crypto; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index 4686c813b3c..6e1754c5f3b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -48,7 +48,6 @@ self: super: { # Newer versions don't compile. Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; - cabal-install_1_18_1_0 = super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; }; cabal-install = self.cabal-install_1_18_1_0; # Needs Cabal >= 1.18.x. 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 46a4b0d02e6..4a8d4242bdc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -45,7 +45,6 @@ self: super: { # Newer versions don't compile. Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6; - cabal-install_1_18_1_0 = super.cabal-install_1_18_1_0.override { Cabal = self.Cabal_1_18_1_6; }; cabal-install = self.cabal-install_1_18_1_0; # https://github.com/tibbe/hashable/issues/85 |