From 281b49208c40556c6cdc9d69d817e73440831bd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 11 Nov 2025 15:12:42 +0100 Subject: [PATCH] hydra-eval-jobs: use nix-eval-jobs's --select rather --expr the current use of builtins.getFlake, mean we don't have pure evaluation --- src/script/hydra-eval-jobset | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/script/hydra-eval-jobset b/src/script/hydra-eval-jobset index eeea742f..7eb13412 100755 --- a/src/script/hydra-eval-jobset +++ b/src/script/hydra-eval-jobset @@ -358,21 +358,14 @@ sub evalJobs { my @cmd; if (defined $flakeRef) { - my $nix_expr = - "let " . - "flake = builtins.getFlake (toString \"$flakeRef\"); " . - "in " . - "flake.hydraJobs " . - "or flake.checks " . - "or (throw \"flake '$flakeRef' does not provide any Hydra jobs or checks\")"; - @cmd = ("nix-eval-jobs", # Disable the eval cache to prevent SQLite database contention. # Since Hydra typically evaluates each revision only once, # parallel workers would compete for database locks without # providing any benefit from caching. "--option", "eval-cache", "false", - "--expr", $nix_expr); + "--flake", $flakeRef, + "--select", "flake: flake.outputs.hydraJobs or flake.outputs.checks or (throw \"flake '$flakeRef' does not provide any Hydra jobs or checks\")"); } else { my $nixExprInput = $inputInfo->{$nixExprInputName}->[0] or die "cannot find the input containing the job expression\n";