From 0b05129b880d23bd11451b4ff5849e06f4309297 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 20 Jan 2015 14:46:21 +0100 Subject: [PATCH] happy: fix build with GHC 7.2.x --- pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 5 ++++- 2 files changed, 5 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 78f3479ddb5..40a8ef43ae8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -55,6 +55,6 @@ self: super: { containers_0_4_2_1 = doJailbreak super.containers_0_4_2_1; # These packages need more recent versions of core libraries to compile. - happy = addBuildTools super.happy [self.containers_0_4_2_1 self.deepseq_1_3_0_1 self.containers_0_4_2_1]; + happy = addBuildTools super.happy [self.containers_0_4_2_1 self.deepseq_1_3_0_1]; } 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 fa089f8bab3..430b4b579e6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -51,7 +51,10 @@ self: super: { # Haddock chokes on the prologue from the cabal file. ChasingBottoms = dontHaddock super.ChasingBottoms; + # The old containers version won't compile against newer versions of deepseq. + containers_0_4_2_1 = super.containers_0_4_2_1.override { deepseq = self.deepseq_1_3_0_1; }; + # These packages need more recent versions of core libraries to compile. - happy = addBuildTools super.happy [self.containers_0_4_2_1 self.deepseq_1_3_0_1 self.containers_0_4_2_1]; + happy = addBuildTools super.happy [self.containers_0_4_2_1 self.deepseq_1_3_0_1]; }