From 00892b7e4ed2e8eb52227db8e8312a06bd1d6699 Mon Sep 17 00:00:00 2001 From: David Johnson Date: Fri, 9 Jun 2017 10:04:34 -0700 Subject: [PATCH] generic-builder.nix: Update doHaddock By default, `ghcjs` haddocks are precluded from being built. I see no reason to disallow building haddocks on projects built with `ghc` and `ghcjs` (someone can correct me here). `HaLVM` currently does not support `haddock` since it's a Stage 1 `GHC`. https://github.com/GaloisInc/HaLVM/blob/master/src/misc/build.mk.in#L20 Currently, building `haddocks` for `ghcjs` projects requires altering the derivation, which doesn't allow users to take advantage of the cache. This change will relieve that. --- pkgs/development/haskell-modules/generic-builder.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7d21996fe1cd..9516aca53663 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -34,8 +34,7 @@ , license , maintainers ? [] , doCoverage ? false -# TODO Do we care about haddock when cross-compiling? -, doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8") +, doHaddock ? (!ghc.isHaLVM or true) , passthru ? {} , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? [] , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []