summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-04-07 21:52:26 +0000
committerRobin Gloster <mail@glob.in>2016-04-07 21:52:26 +0000
commit3e68106afd95df012ddb548575f0133681687a90 (patch)
treee2919b6900e6de13a3f52756acc02058a1ef0421 /pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
parenta73a28de7b16734d8e28da8be43a06b92eeb6bc3 (diff)
parent25cc1c12febf74c66d661528e2fc2b00caff1bf1 (diff)
downloadnixlib-3e68106afd95df012ddb548575f0133681687a90.tar
nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.gz
nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.bz2
nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.lz
nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.xz
nixlib-3e68106afd95df012ddb548575f0133681687a90.tar.zst
nixlib-3e68106afd95df012ddb548575f0133681687a90.zip
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index e39002b8dec4..2e013ee940a2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -47,9 +47,16 @@ self: super: {
   hspec-core = dontCheck super.hspec-core;
 
   # Deviate from Stackage here to fix lots of builds.
-  transformers-compat = super.transformers-compat_0_5_1_4;
+  transformers-compat = self.transformers-compat_0_5_1_4;
 
   # https://github.com/sol/doctest/issues/125
   doctest = self.doctest_0_11_0;
 
+  # No modules defined for this compiler.
+  fail = dontHaddock super.fail;
+
+  # Version 4.x doesn't compile with transformers 0.5 or later.
+  comonad_5 = dontCheck super.comonad_5;  # https://github.com/ekmett/comonad/issues/33
+  comonad = self.comonad_5;
+
 }