From 12c9251a3d19ffc304c5b6c91c4cc1dc49d69a24 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 Jun 2013 12:12:08 +0200 Subject: [PATCH] haskell-defaults.nix: add overrides to fix the latest cabal-install build with older GHC versions --- pkgs/top-level/haskell-defaults.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 23573478e39..35ff9cf4097 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -98,6 +98,11 @@ jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; bmp = self.bmp_1_2_2_1; + cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { + Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; + mtl = self.mtl_2_1_2; + HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; }; + }; }; ghc6121Prefs = @@ -111,6 +116,12 @@ jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; bmp = self.bmp_1_2_2_1; + cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { + Cabal = self.Cabal_1_16_0_3; + zlib = self.zlib_0_5_3_3; + mtl = self.mtl_2_1_2; + HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; }; + }; }; ghc6104Prefs = @@ -125,6 +136,12 @@ # deviating from Haskell platform here, to make some packages (notably statistics) compile jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; bmp = self.bmp_1_2_2_1; + cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { + Cabal = self.Cabal_1_16_0_3; + zlib = self.zlib_0_5_3_3; + mtl = self.mtl_2_1_2; + HTTP = self.HTTP_4000_1_1.override { mtl = self.mtl_2_1_2; }; + }; }; # Abstraction for Haskell packages collections