From 2d201d41ca1f90e0f1a7ec3b8054711133a2e024 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 27 May 2016 18:37:30 +0200
Subject: [PATCH] configuration-ghc-7.10.x.nix: update to cabal-install 1.24.x
by default
---
.../development/haskell-modules/configuration-ghc-7.10.x.nix | 5 +----
1 file changed, 1 insertion(+), 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);