summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghc-head.nix
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2017-01-07 10:28:48 -0500
committerShea Levy <shea@shealevy.com>2017-01-07 10:28:48 -0500
commit71fc7f97482739ba742b9bc2101c20225cc5cb35 (patch)
treec2a9020881ee4557682f1c73aca68b902129dfb5 /pkgs/development/haskell-modules/configuration-ghc-head.nix
parent133ba5f08a33b747706e55e11900f1ebeac104a0 (diff)
downloadnixlib-71fc7f97482739ba742b9bc2101c20225cc5cb35.tar
nixlib-71fc7f97482739ba742b9bc2101c20225cc5cb35.tar.gz
nixlib-71fc7f97482739ba742b9bc2101c20225cc5cb35.tar.bz2
nixlib-71fc7f97482739ba742b9bc2101c20225cc5cb35.tar.lz
nixlib-71fc7f97482739ba742b9bc2101c20225cc5cb35.tar.xz
nixlib-71fc7f97482739ba742b9bc2101c20225cc5cb35.tar.zst
nixlib-71fc7f97482739ba742b9bc2101c20225cc5cb35.zip
ghc-head: Fixes for new base and Cabal
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-head.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-head.nix7
1 files changed, 7 insertions, 0 deletions
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;
 }