From 71fc7f97482739ba742b9bc2101c20225cc5cb35 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 7 Jan 2017 10:28:48 -0500 Subject: ghc-head: Fixes for new base and Cabal --- pkgs/development/haskell-modules/configuration-ghc-head.nix | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'pkgs/development/haskell-modules/configuration-ghc-head.nix') diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index a2b6058b166e..f093c0e427e8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -86,4 +86,11 @@ self: super: { # Won't work with LLVM 3.5. llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general; + # A bunch of jailbreaks due to 'base' bump + old-locale = doJailbreak super.old-locale; + primitive = doJailbreak super.primitive; + test-framework = doJailbreak super.test-framework; + atomic-primops = doJailbreak (appendPatch super.atomic-primops ./patches/atomic-primops-Cabal-1.25.patch); + hashable = doJailbreak super.hashable; + stm = doJailbreak super.stm; } -- cgit 1.4.1