From bc37e667c4d5f134f4b9d4a12101d13a74614e9c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 16 Oct 2025 18:45:46 +0200
Subject: [PATCH 1/2] Revert "workflows/eval: run Lix in the merge queue"

This reverts commit 7ed2c7e297db3cd90e7e3e952e5068eb24ec6aef.

This breaks the performance report, because it compares Lix vs Nix and
needs more thought before re-application.
---
 .github/workflows/eval.yml        | 9 ++-------
 .github/workflows/merge-group.yml | 2 --
 .github/workflows/pr.yml          | 1 -
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index f2c7a2c135683..daa587908f985 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -11,9 +11,6 @@ on:
       systems:
         required: true
         type: string
-      defaultVersion:
-        required: true
-        type: string
       testVersions:
         required: false
         default: false
@@ -108,7 +105,7 @@ jobs:
       - name: Evaluate the ${{ matrix.system }} output paths at the merge commit
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
-          MATRIX_VERSION: ${{ matrix.version || inputs.defaultVersion }}
+          MATRIX_VERSION: ${{ matrix.version || 'nixVersions.latest' }}
         run: |
           nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned  -A eval.singleSystem \
             --argstr evalSystem "$MATRIX_SYSTEM" \
@@ -122,14 +119,12 @@ jobs:
         if: inputs.targetSha
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
-          # This must match the default version set in the Merge Queue.
-          VERSION: lixPackageSets.latest.lix
         # This is very quick, because it pulls the eval results from Cachix.
         run: |
           nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.singleSystem \
             --argstr evalSystem "$MATRIX_SYSTEM" \
             --arg chunkSize 8000 \
-            --argstr nixPath "$VERSION" \
+            --argstr nixPath "nixVersions.latest" \
             --out-link target
 
       - name: Compare outpaths against the target branch
diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml
index 6298aaa4424d4..6ae96f0900f79 100644
--- a/.github/workflows/merge-group.yml
+++ b/.github/workflows/merge-group.yml
@@ -55,8 +55,6 @@ jobs:
     with:
       mergedSha: ${{ inputs.mergedSha || github.event.merge_group.head_sha }}
       systems: ${{ needs.prepare.outputs.systems }}
-      # This must match the version in Eval's target step.
-      defaultVersion: lixPackageSets.latest.lix
 
   # This job's only purpose is to create the target for the "Required Status Checks" branch ruleset.
   # It "needs" all the jobs that should block the Merge Queue.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index a9d40fcdcf5dc..9f4a2ba4d0b46 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -86,7 +86,6 @@ jobs:
       mergedSha: ${{ needs.prepare.outputs.mergedSha }}
       targetSha: ${{ needs.prepare.outputs.targetSha }}
       systems: ${{ needs.prepare.outputs.systems }}
-      defaultVersion: nixVersions.latest
       testVersions: ${{ contains(fromJSON(needs.prepare.outputs.touched), 'pinned') && !contains(fromJSON(needs.prepare.outputs.headBranch).type, 'development') }}
 
   labels:

From 1c628df31939cd75540b3dfcf5b3ec988fe13ff6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 16 Oct 2025 18:47:51 +0200
Subject: [PATCH 2/2] workflows/eval: remove exception for devShellTools from
 report

These were fixed recently, so we don't need the exception anymore.
---
 .github/workflows/eval.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index daa587908f985..7e96518b590ea 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -284,10 +284,6 @@ jobs:
                           diff.removed,
                           diff.changed,
                           diff.rebuilds
-                        ).filter(attr =>
-                          // Exceptions related to dev shells, which changed at some time between 2.18 and 2.24.
-                          !attr.startsWith('tests.devShellTools.nixos.') &&
-                          !attr.startsWith('tests.devShellTools.unstructuredDerivationInputEnv.')
                         )
                         if (attrs.length > 0) {
                           core.setFailed(