public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-ng: rename "noHaddock" attribute to "doHaddock"

Browse Source 
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.
This commit is contained in:
Peter Simons 2015-01-18 11:04:38 +01:00
parent 8c833f2a12
commit 380114738f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -137,8 +137,8 @@ self: super: {
version = "2.0"; version = "2.0";
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "http://github.com/NixOS/cabal2nix.git"; url = "http://github.com/NixOS/cabal2nix.git";
sha256 = "c1927f7441a057f02d25cbca855f533fc8073e7680083caa86d48e3d69ab69fd"; sha256 = "8e1943affa70bf664d6b306f6331bad9332ca74816078f298d4acff0921c8520";
rev = "0c4c1f2529a7e4b83ec21922d77c792a9bd1d662"; rev = "a5db30dbd55d7b4ec5df8fa116083b786bcf81c4";
}; };
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;

4
pkgs/development/haskell-modules/default.nix
View File

@ -21,7 +21,7 @@ let
inherit (self) ghc jailbreak-cabal; inherit (self) ghc jailbreak-cabal;
hscolour = overrideCabal self.hscolour (drv: { hscolour = overrideCabal self.hscolour (drv: {
isLibrary = false; isLibrary = false;
noHaddock = true; doHaddock = false;
hyperlinkSource = false; # Avoid depending on hscolour for this build. hyperlinkSource = false; # Avoid depending on hscolour for this build.
postFixup = "rm -rf $out/lib $out/share $out/nix-support"; postFixup = "rm -rf $out/lib $out/share $out/nix-support";
}); });
@ -29,7 +29,7 @@ let
mkDerivation = drv: super.mkDerivation (drv // { mkDerivation = drv: super.mkDerivation (drv // {
enableSharedExecutables = false; enableSharedExecutables = false;
enableSharedLibraries = false; enableSharedLibraries = false;
noHaddock = true; doHaddock = false;
useCpphs = false; useCpphs = false;
}); });
})) (drv: { })) (drv: {

4
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -27,7 +27,7 @@
, jailbreak ? false , jailbreak ? false
, license , license
, maintainers ? [] , maintainers ? []
, noHaddock ? false , doHaddock ? true
, passthru ? {} , passthru ? {}
, pkgconfigDepends ? [] , pkgconfigDepends ? []
, platforms ? ghc.meta.platforms , platforms ? ghc.meta.platforms
@ -214,7 +214,7 @@ stdenv.mkDerivation ({
haddockPhase = '' haddockPhase = ''
runHook preHaddock runHook preHaddock
${optionalString (!noHaddock && hasActiveLibrary) '' ${optionalString (doHaddock && hasActiveLibrary) ''
./Setup haddock --html \ ./Setup haddock --html \
${optionalString doHoogle "--hoogle"} \ ${optionalString doHoogle "--hoogle"} \
${optionalString (hasActiveLibrary && hyperlinkSource) "--hyperlink-source"} ${optionalString (hasActiveLibrary && hyperlinkSource) "--hyperlink-source"}

4
pkgs/development/haskell-modules/lib.nix
View File

@ -8,8 +8,8 @@ rec {
overrideScope = scope: overrideCabal (drv.overrideScope scope) f; overrideScope = scope: overrideCabal (drv.overrideScope scope) f;
}; };
doHaddock = drv: overrideCabal drv (drv: { noHaddock = false; }); doHaddock = drv: overrideCabal drv (drv: { doHaddock = true; });
dontHaddock = drv: overrideCabal drv (drv: { noHaddock = true; }); dontHaddock = drv: overrideCabal drv (drv: { doHaddock = false; });
doJailbreak = drv: overrideCabal drv (drv: { jailbreak = true; }); doJailbreak = drv: overrideCabal drv (drv: { jailbreak = true; });
dontJailbreak = drv: overrideCabal drv (drv: { jailbreak = false; }); dontJailbreak = drv: overrideCabal drv (drv: { jailbreak = false; });