summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/generic-builder.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-01-18 11:04:38 +0100
committerPeter Simons <simons@cryp.to>2015-01-18 12:58:31 +0100
commit380114738f534af52b06696e91a43885e719e299 (patch)
treecfd4318ca2388473253f25cd995616af03367d95 /pkgs/development/haskell-modules/generic-builder.nix
parent8c833f2a12573842bed962c9a839d9dee06b8cb6 (diff)
downloadnixlib-380114738f534af52b06696e91a43885e719e299.tar
nixlib-380114738f534af52b06696e91a43885e719e299.tar.gz
nixlib-380114738f534af52b06696e91a43885e719e299.tar.bz2
nixlib-380114738f534af52b06696e91a43885e719e299.tar.lz
nixlib-380114738f534af52b06696e91a43885e719e299.tar.xz
nixlib-380114738f534af52b06696e91a43885e719e299.tar.zst
nixlib-380114738f534af52b06696e91a43885e719e299.zip
haskell-ng: rename "noHaddock" attribute to "doHaddock"
This makes the attribute (a) consistent with "doCheck" and friends and (b)
avoids the double negation "noHaddock = false" meaning "doHaddock = true".

Fixes https://github.com/NixOS/cabal2nix/issues/63.
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
-rw-r--r--pkgs/development/haskell-modules/generic-builder.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index a4368838fe43..9fe6c1a78ba7 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -27,7 +27,7 @@
 , jailbreak ? false
 , license
 , maintainers ? []
-, noHaddock ? false
+, doHaddock ? true
 , passthru ? {}
 , pkgconfigDepends ? []
 , platforms ? ghc.meta.platforms
@@ -214,7 +214,7 @@ stdenv.mkDerivation ({
 
   haddockPhase = ''
     runHook preHaddock
-    ${optionalString (!noHaddock && hasActiveLibrary) ''
+    ${optionalString (doHaddock && hasActiveLibrary) ''
       ./Setup haddock --html \
         ${optionalString doHoogle "--hoogle"} \
         ${optionalString (hasActiveLibrary && hyperlinkSource) "--hyperlink-source"}