From d5fe0a33e058c02aa5f28ac0760caedb679a0d15 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Tue, 10 Jun 2025 14:40:37 +1200 Subject: [PATCH 1/2] Run custom preprocessors before `setup haddock` Run `setup build --with-ghc=false || true` before running `setup haddock` to make sure the preprocessor outputs of any custom build step are present. Fixes #2243 --- builder/haddock-builder.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/builder/haddock-builder.nix b/builder/haddock-builder.nix index 24f56cbf04..ae6a853259 100644 --- a/builder/haddock-builder.nix +++ b/builder/haddock-builder.nix @@ -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"} \ From cca28c902c4e987e6bc3e06f5bd2767ecd408d08 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Thu, 12 Jun 2025 23:30:52 +1200 Subject: [PATCH 2/2] Reduce number of tests --- ci.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci.nix b/ci.nix index e07482ba5e..cbef43e890 100644 --- a/ci.nix +++ b/ci.nix @@ -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;