about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2017-12-20 20:49:11 +0100
committerGitHub <noreply@github.com>2017-12-20 20:49:11 +0100
commitcb0b1423ad273943363bfbbea018d1507b144fc0 (patch)
tree2059fb564df48fd93d3ec8d6d1de522f43b6ee6e /pkgs
parent58e6897a56a884000a7e577e0b001d9a1fadd550 (diff)
parent3e22c56161c7830850bb5194a2dc90f154448014 (diff)
downloadnixlib-cb0b1423ad273943363bfbbea018d1507b144fc0.tar
nixlib-cb0b1423ad273943363bfbbea018d1507b144fc0.tar.gz
nixlib-cb0b1423ad273943363bfbbea018d1507b144fc0.tar.bz2
nixlib-cb0b1423ad273943363bfbbea018d1507b144fc0.tar.lz
nixlib-cb0b1423ad273943363bfbbea018d1507b144fc0.tar.xz
nixlib-cb0b1423ad273943363bfbbea018d1507b144fc0.tar.zst
nixlib-cb0b1423ad273943363bfbbea018d1507b144fc0.zip
Merge pull request #32896 from PierreR/master
Haskell-language-puppet: don't build haddock
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4253283d3c86..b2d0f6636992 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -996,4 +996,8 @@ self: super: {
   # Duplicate instance with smallcheck.
   store = dontCheck super.store;
 
+  # With ghc-8.2.x haddock would time out for unknown reason
+  # See https://github.com/haskell/haddock/issues/679
+  language-puppet = dontHaddock super.language-puppet;
+
 }