summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix7
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix7
2 files changed, 12 insertions, 2 deletions
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 caef6c4b7546..ea21f0090710 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -46,8 +46,13 @@ self: super: {
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 
+  # Newer versions don't compile.
+  Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
+  cabal-install_1_18_0_8 = super.cabal-install_1_18_0_8.override { Cabal = self.Cabal_1_18_1_6; };
+  cabal-install = self.cabal-install_1_18_0_8;
+
   # Needs Cabal >= 1.18.x.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
 
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
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 49296fa04df3..b06a9dbbbd35 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -43,11 +43,16 @@ self: super: {
   # https://github.com/haskell/cabal/issues/2322
   Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_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;
+  cabal-install_1_18_0_8 = super.cabal-install_1_18_0_8.override { Cabal = self.Cabal_1_18_1_6; };
+  cabal-install = self.cabal-install_1_18_0_8;
+
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 
   # Needs Cabal >= 1.18.x.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
 
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;