Skip to content

Run custom preprocessors before setup haddock #2386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 12, 2025
Merged

Run custom preprocessors before setup haddock #2386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5fe0a3
Run custom preprocessors before `setup haddock`
hamishmack Jun 10, 2025
8d58eec
Merge remote-tracking branch 'origin/master' into hkm/haddock-preproc…
hamishmack Jun 12, 2025
cca28c9
Reduce number of tests
hamishmack Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions builder/haddock-builder.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ let

# If we don't have any source files, no need to run haddock
[[ -n $(find . -name "*.hs" -o -name "*.lhs") ]] && {
# Run any preprocessor in the custom build step
$SETUP_HS build \
"--with-ghc=false" \
${lib.optionalString (haskellLib.isTest componentId) "--tests"} \
${lib.concatStringsSep " " setupHaddockFlags} || true

$SETUP_HS haddock \
"--html" \
${lib.optionalString (haskellLib.isTest componentId) "--tests"} \
Expand Down
8 changes: 4 additions & 4 deletions ci.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
# from here (so that is no longer cached) also remove ./materialized/ghcXXX.
# Update supported-ghc-versions.md to reflect any changes made here.
nixpkgs.lib.optionalAttrs (builtins.elem nixpkgsName ["R2411" "R2505"]) {
ghc96 = true;
ghc98 = true;
ghc910 = true;
ghc912 = true;
ghc96 = false;
ghc98 = false;
ghc910 = false;
ghc912 = false;
} // nixpkgs.lib.optionalAttrs (nixpkgsName == "unstable") {
ghc96 = true;
ghc98 = true;
Expand Down
Loading