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.

4 files changed, 8 insertions, 8 deletions

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ea4bcd99939..c5d59e50afe 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -137,8 +137,8 @@ self: super: {
     version = "2.0";
     src = pkgs.fetchgit {
       url = "http://github.com/NixOS/cabal2nix.git";
-      sha256 = "c1927f7441a057f02d25cbca855f533fc8073e7680083caa86d48e3d69ab69fd";
-      rev = "0c4c1f2529a7e4b83ec21922d77c792a9bd1d662";
+      sha256 = "8e1943affa70bf664d6b306f6331bad9332ca74816078f298d4acff0921c8520";
+      rev = "a5db30dbd55d7b4ec5df8fa116083b786bcf81c4";
     };
     isLibrary = false;
     isExecutable = true;
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 8978486e930..973ff83c42d 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -21,7 +21,7 @@ let
         inherit (self) ghc jailbreak-cabal;
         hscolour = overrideCabal self.hscolour (drv: {
           isLibrary = false;
-          noHaddock = true;
+          doHaddock = false;
           hyperlinkSource = false;      # Avoid depending on hscolour for this build.
           postFixup = "rm -rf $out/lib $out/share $out/nix-support";
         });
@@ -29,7 +29,7 @@ let
           mkDerivation = drv: super.mkDerivation (drv // {
             enableSharedExecutables = false;
             enableSharedLibraries = false;
-            noHaddock = true;
+            doHaddock = false;
             useCpphs = false;
           });
         })) (drv: {
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index a4368838fe4..9fe6c1a78ba 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"}
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 121508488e9..4d0afb33ca0 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -8,8 +8,8 @@ rec {
     overrideScope = scope: overrideCabal (drv.overrideScope scope) f;
   };
 
-  doHaddock = drv: overrideCabal drv (drv: { noHaddock = false; });
-  dontHaddock = drv: overrideCabal drv (drv: { noHaddock = true; });
+  doHaddock = drv: overrideCabal drv (drv: { doHaddock = true; });
+  dontHaddock = drv: overrideCabal drv (drv: { doHaddock = false; });
 
   doJailbreak = drv: overrideCabal drv (drv: { jailbreak = true; });
   dontJailbreak = drv: overrideCabal drv (drv: { jailbreak = false; });