diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 1dee12ca12c..5d7b8d65b6a 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -52,7 +52,7 @@ mkDerivation (rec { }; isLibrary = true; isExecutable = true; - jailbreak = true; + jailbreak = false; # manually jailbreak, until postPatch in mkDerivation is fixed doHaddock = false; doCheck = false; buildDepends = [ @@ -72,6 +72,9 @@ mkDerivation (rec { ]; patches = [ ./ghcjs.patch ]; postPatch = '' + echo "Run jailbreak-cabal to lift version restrictions on build inputs." + ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal + substituteInPlace Setup.hs \ --replace "/usr/bin/env" "${coreutils}/bin/env" @@ -119,5 +122,4 @@ mkDerivation (rec { license = stdenv.lib.licenses.bsd3; platforms = ghc.meta.platforms; maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ]; - broken = true; # depends on outdated versions of its Haskell build inputs }) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 6f68dec78e4..ca940e8de31 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -58,7 +58,7 @@ self: super: { # These packages are core libraries in GHC 7.10.x, but not here. bin-package-db = null; haskeline = self.haskeline_0_7_2_1; - hoopl = self.hoopl_3_10_2_0; + hoopl = self.hoopl_3_10_2_1; hpc = self.hpc_0_6_0_2; terminfo = self.terminfo_0_4_0_1; xhtml = self.xhtml_3000_2_1;