From 2e306afa6898bd0a3154a45f854ddd62e6c22d3b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 2 Sep 2025 12:10:47 +0200 Subject: [PATCH] maintainers/scripts/haskell/hydra-report: speed up with --no-instantiate This is a new flag introduced in `nix-eval-jobs`, which reduces runtime for the `ping-maintainers` subcommand from 12 minutes to 3 minutes for me. The `--constituents` flag is not supported anymore with `--no-instantiate`, but it doesn't seem to make a difference anyway. Same for `--max-jobs` - I don't get a difference with or without it. Removing the `foldl'` import because it is warned to be redundant after switching to import the current nixpkgs instance, likely due to a newer GHC version (?). --- maintainers/scripts/haskell/hydra-report.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 8abfcf1ed1a5..263d0aa50e6e 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -1,4 +1,5 @@ #! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=. #! nix-shell -p "haskellPackages.ghcWithPackages (p: [p.aeson p.req])" #! nix-shell -p nix-eval-jobs #! nix-shell -i runhaskell @@ -42,7 +43,7 @@ import Data.Aeson ( encodeFile, ) import Data.Aeson.Decoding (eitherDecodeStrictText) -import Data.Foldable (Foldable (toList), foldl') +import Data.Foldable (Foldable (toList)) import Data.Either (rights) import Data.Functor ((<&>)) import Data.List.NonEmpty (NonEmpty, nonEmpty) @@ -230,9 +231,9 @@ nixEvalJobsParams = -- options necessary to make nix-eval-jobs behave like hydra-eval-jobs used to -- https://github.com/NixOS/hydra/commit/d84ff32ce600204c6473889a3ff16cd6053533c9 "--meta", - "--constituents", "--force-recurse", - "--max-jobs", "1", + "--no-instantiate", + "--workers", "3", "-I", ".", "pkgs/top-level/release-haskell.nix"