Update hydra eval checks

Author: hamishmack

.github/workflows/pipeline.yml

@@ -139,31 +139,37 @@ jobs:
 
   hydra-ifdLevel-0-and-1:
     runs-on: [self-hosted, linux]
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
       - name: "Check that jobset will evaluate in Hydra at ifdLevel 0 and 1"
         run: |
           nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
-          ./check-hydra.sh --arg ifdLevel 0
-          ./check-hydra.sh --arg ifdLevel 1
+          sed -i 's/ifdLevel = 3/ifdLevel = 0/' flake.nix
+          ./check-hydra.sh
+          sed -i 's/ifdLevel = 0/ifdLevel = 1/' flake.nix
+          ./check-hydra.sh
 
   hydra-ifdLevel-2:
     runs-on: [self-hosted, linux]
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@v4
       - name: "Check that jobset will evaluate in Hydra at ifdLevel 2"
         run: |
           nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
-          ./check-hydra.sh --arg ifdLevel 2
+          sed -i 's/ifdLevel = 3/ifdLevel = 2/' flake.nix
+          ./check-hydra.sh
 
   hydra-ifdLevel-3-and-ghc-8-10:
     runs-on: [self-hosted, linux]
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
-      - name: "Check that jobset will evaluate in Hydra at ifdLevel 3 and ghc 8.10"
+      - name: "Check that jobset will evaluate in Hydra at ifdLevel 3"
         run: |
           nix-build build.nix -A maintainer-scripts.check-hydra -o check-hydra.sh
-          ./check-hydra.sh --arg ifdLevel 3 --arg include 'x: __substring 0 6 x == "ghc810"'
+          ./check-hydra.sh
 
   hydra-ifdLevel-3-and-ghc-9-2:
     runs-on: [self-hosted, linux]

overlays/default.nix

@@ -78,7 +78,6 @@ let
     compiler-llvm = import ./compiler-llvm.nix;
     ghc = import ./ghc.nix;
     ghc-packages = import ./ghc-packages.nix;
-    hydra = import ./hydra.nix { inherit sources; };
     darwin = import ./darwin.nix;
     windows = import ./windows.nix;
     armv6l-linux = import ./armv6l-linux.nix;
@@ -129,7 +128,6 @@ let
     cabalPkgConfig
     gobject-introspection
     hix
-    hydra
     # Restore nixpkgs haskell and haskellPackages
     (_: prev: { inherit (prev.haskell-nix-prev) haskell haskellPackages; })
     cacheCompilerDeps

overlays/hydra.nix

@@ -1,22 +1,19 @@
-{ stdenv, glibc, lib, writeScript, coreutils, time, gnutar, gzip, hydra-unstable, jq, gitMinimal }:
+{ stdenv, glibc, lib, writeScript, coreutils, time, gnutar, gzip, hydra_unstable, jq, gitMinimal }:
 
 with lib;
 
 writeScript "check-hydra.sh" ''
   #! /usr/bin/env nix-shell
-  #! nix-shell -i bash --pure -p glibc coreutils time gnutar gzip hydra-unstable jq gitMinimal
+  #! nix-shell -i bash --pure -p glibc coreutils time gnutar gzip hydra_unstable jq gitMinimal
 
   set -euo pipefail
 
   export NIX_PATH=
 
   echo '~~~ Evaluating release.nix with' "$@"
-  command time --format '%e' -o eval-time.txt \
+  HYDRA_CONFIG= command time --format '%e' -o eval-time.txt \
       hydra-eval-jobs \
-      --option allowed-uris "https://github.com/NixOS https://github.com/input-output-hk" \
-      --arg supportedSystems '[ builtins.currentSystem ]' \
-      "$@" \
-      -I $(realpath .) release.nix > eval.json
+      --flake $(pwd) > eval.json
   EVAL_EXIT_CODE="$?"
   if [ "$EVAL_EXIT_CODE" != 0 ]
   then