diff options
| author | Peter Simons <simons@cryp.to> | 2016-05-27 18:37:30 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2016-05-31 22:09:55 +0200 |
| commit | 2d201d41ca1f90e0f1a7ec3b8054711133a2e024 (patch) | |
| tree | e7e8bba8de0d51501be4bc4ba92f66053d4ff4a5 /pkgs/development/haskell-modules | |
| parent | 900aa316448458dab5b8ab08636a918f298850e2 (diff) | |
| download | nixlib-2d201d41ca1f90e0f1a7ec3b8054711133a2e024.tar nixlib-2d201d41ca1f90e0f1a7ec3b8054711133a2e024.tar.gz nixlib-2d201d41ca1f90e0f1a7ec3b8054711133a2e024.tar.bz2 nixlib-2d201d41ca1f90e0f1a7ec3b8054711133a2e024.tar.lz nixlib-2d201d41ca1f90e0f1a7ec3b8054711133a2e024.tar.xz nixlib-2d201d41ca1f90e0f1a7ec3b8054711133a2e024.tar.zst nixlib-2d201d41ca1f90e0f1a7ec3b8054711133a2e024.zip | |
configuration-ghc-7.10.x.nix: update to cabal-install 1.24.x by default
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 7e82d94e3485..24cf6fdeab4a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -33,11 +33,8 @@ self: super: { unix = null; xhtml = null; - # Our core version of Cabal is good enough for this build. - cabal-install = dontCheck (super.cabal-install.override { Cabal = null; }); - # Enable latest version of cabal-install. - cabal-install_1_24_0_0 = (doDistribute (dontJailbreak (dontCheck (super.cabal-install_1_24_0_0)))).overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; }); + cabal-install = (doDistribute (dontJailbreak (dontCheck (super.cabal-install)))).overrideScope (self: super: { Cabal = self.Cabal_1_24_0_0; }); # Jailbreaking is required for the test suite only (which we don't run). Cabal_1_24_0_0 = dontJailbreak (dontCheck super.Cabal_1_24_0_0); |