Merge branch 'master.upstream' into staging.upstream

2015-08-21 15:17:26 -07:00
parent 92a2ee7deb 6d6eb1913a
commit 64cd711f5c
31 changed files with 167 additions and 174 deletions
@@ -28,7 +28,7 @@
 , jailbreak ? false
 , license
 , maintainers ? []
-, doHaddock ? true
+, doHaddock ? !stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8"
 , passthru ? {}
 , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? []
 , platforms ? ghc.meta.platforms