Skip to content

Commit 6c73e27

Browse files
committed
fixup! builder: Add haddock and hoogle to components.library.doc
1 parent 622f2e8 commit 6c73e27

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

builder/comp-builder.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,7 @@ stdenv.mkDerivation ({
281281
"--html" \
282282
${lib.optionalString doHoogle "--hoogle"} \
283283
${lib.optionalString hyperlinkSource "--hyperlink-source"} \
284-
${lib.concatStringsSep " " component.setupHaddockFlags} \
285-
|| true # some packages don't have haddock documentation
284+
${lib.concatStringsSep " " component.setupHaddockFlags}
286285
287286
html="dist/doc/html/${componentId.cname}"
288287

test/cabal-simple/default.nix

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@ let
1919
{ cabal-simple = ./cabal-simple.nix;
2020
}
2121
];
22-
modules = [ ];
22+
modules = [
23+
{
24+
# Package has no exposed modules which causes
25+
# haddock: No input file(s)
26+
packages.cabal-simple.doHaddock = false;
27+
}
28+
];
2329
};
2430

2531
packages = pkgSet.config.hsPkgs;
@@ -56,8 +62,8 @@ in
5662
meta.platforms = platforms.all;
5763

5864
passthru = {
59-
inherit (packages) cabal-simple;
60-
inherit pkgSet;
65+
# Used for debugging with nix repl
66+
inherit pkgSet packages;
6167

6268
# Used for testing externally with nix-shell (../tests.sh).
6369
# This just adds cabal-install to the existing shells.

0 commit comments

Comments
 (0)