From d13f7c54e30b5eb9e90f226d2a947f66a0ce1b38 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 1 Sep 2017 13:44:00 +0000 Subject: [PATCH 1/2] Use older version of jailbreak-cabal with ghcHEAD See https://github.com/peti/jailbreak-cabal/issues/13 --- pkgs/development/haskell-modules/configuration-ghc-head.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 4b7fc3d8360..7cc32533458 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -35,7 +35,7 @@ self: super: { xhtml = null; # jailbreak-cabal can use the native Cabal library. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; }; + jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal; # haddock: No input file(s). nats = dontHaddock super.nats; From d1ce5b69c0ab43c73c618c505738014d2bc43977 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Fri, 1 Sep 2017 13:48:53 +0000 Subject: [PATCH 2/2] ghcHEAD: Add new boot packages to configuration file --- pkgs/development/haskell-modules/configuration-ghc-head.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 7cc32533458..f81920edd61 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -18,6 +18,9 @@ self: super: { deepseq = null; directory = null; filepath = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; ghc-prim = null; ghci = null; haskeline = null;