From 197e7672e647bf5f5492785048d7d8de1b14e227 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 8 Jan 2015 11:55:39 +0100 Subject: [PATCH] haskell-configuration-ghc-7.9.x: improve configuration to fix some builds --- .../haskell-modules/configuration-ghc-7.9.x.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix index 671bd87ba07..65da7abf05e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix @@ -33,6 +33,13 @@ self: super: { # haddock: internal error: expectJust getPackageDetails mkDerivation = drv: super.mkDerivation (drv // { noHaddock = true; }); + # These used to be a core packages in GHC 7.8.x. + old-locale = self.old-locale_1_0_0_7; + old-time = self.old-time_1_1_0_3; + + # We have transformers 4.x, so we can use the latest mtl. + mtl = self.mtl_2_2_1; + # Setup: At least the following dependencies are missing: base <4.8 hspec-expectations = overrideCabal super.hspec-expectations (drv: { patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal";