public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

happy: fix build with GHC 7.2.x

Browse Source
This commit is contained in:
Peter Simons 2015-01-20 14:46:21 +01:00
parent 4ab133a2c4
commit 0b05129b88
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
View File

@ -55,6 +55,6 @@ self: super: {
containers_0_4_2_1 = doJailbreak super.containers_0_4_2_1; containers_0_4_2_1 = doJailbreak super.containers_0_4_2_1;
# These packages need more recent versions of core libraries to compile. # 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];
} }

5
pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
View File

@ -51,7 +51,10 @@ self: super: {
# Haddock chokes on the prologue from the cabal file. # Haddock chokes on the prologue from the cabal file.
ChasingBottoms = dontHaddock super.ChasingBottoms; 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. # 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];
} }