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

Merge pull request #7303 from teh/master

Browse Source 
Update closure-compiler and fix purescript for ghc 7.8
This commit is contained in:
Peter Simons
2015-04-10 13:48:40 +02:00
parent 86998c7075 0fb056f521
commit 37f7e152d5
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
View File

@@ -73,6 +73,15 @@ self: super: {
mtl-prelude = self.mtl-prelude_1_0_3;
equivalence = super.equivalence_0_2_5; # required by Agda
# purescript requires mtl 2.2.x.
purescript = overrideCabal (super.purescript.overrideScope (self: super: {
mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; });
mtl = super.mtl_2_2_1;
transformers = super.transformers_0_4_3_0;
haskeline = self.haskeline_0_7_2_1;
transformers-compat = disableCabalFlag super.transformers-compat "three";
})) (drv: {});
# The test suite pulls in mtl 2.2.x
command-qq = dontCheck super.command-qq;
@@ -96,7 +105,6 @@ self: super: {
highlighter2 = markBroken super.highlighter2;
hypher = markBroken super.hypher;
miniforth = markBroken super.miniforth;
purescript = markBroken super.purescript;
xhb-atom-cache = markBroken super.xhb-atom-cache;
xhb-ewmh = markBroken super.xhb-ewmh;
yesod-purescript = markBroken super.yesod-purescript;