From e36427857d3e9a70c241a8c1ffd3949dce913b7f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 5 May 2015 20:35:43 +0200 Subject: [PATCH] Fix cabal-install builds with ghc 7.0.x and 7.2.x. --- .../haskell-modules/configuration-ghc-7.0.x.nix | 7 ++++++- .../haskell-modules/configuration-ghc-7.2.x.nix | 7 ++++++- 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 caef6c4b754..ea21f009071 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 49296fa04df..b06a9dbbbd3 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;