diff options
author | William A. Kennington III <william@wkennington.com> | 2015-08-21 15:17:26 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-08-21 15:17:26 -0700 |
commit | 64cd711f5c54b8c3e4a489b15ae1c0c0d8e98b2f (patch) | |
tree | 141cdac78ab7c937d4599c6a9e285335e752ef4e /pkgs/development/haskell-modules | |
parent | 92a2ee7debd941c2147c5fa3fc465eb7492459d6 (diff) | |
parent | 6d6eb1913a38adf6fcd5c7bbab1208da9dc6d456 (diff) | |
download | nixpkgs-64cd711f5c54b8c3e4a489b15ae1c0c0d8e98b2f.tar nixpkgs-64cd711f5c54b8c3e4a489b15ae1c0c0d8e98b2f.tar.gz nixpkgs-64cd711f5c54b8c3e4a489b15ae1c0c0d8e98b2f.tar.bz2 nixpkgs-64cd711f5c54b8c3e4a489b15ae1c0c0d8e98b2f.tar.lz nixpkgs-64cd711f5c54b8c3e4a489b15ae1c0c0d8e98b2f.tar.xz nixpkgs-64cd711f5c54b8c3e4a489b15ae1c0c0d8e98b2f.tar.zst nixpkgs-64cd711f5c54b8c3e4a489b15ae1c0c0d8e98b2f.zip |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/haskell-modules')
-rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 95f58b7322d..f76719a3117 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -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 |