diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 428346b78b6..2135e75a07a 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "closure-compiler-${version}"; - version = "20130603"; + version = "20150315"; src = fetchurl { url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "0bk0s8p9r9an5m0l8y23wjlx490k15i4zah0a384a2akzji8y095"; + sha256 = "1vzwyhpqbrndg7mri81f1b2yi8cshw5pghvdda9vdxgq465sa52f"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index e9bdec89bd0..c9d11ce90b3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -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;