From 36cc8d5f4b221ad27e1a172148363e9780329277 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 24 Apr 2024 15:26:18 +0200
Subject: [PATCH 1/4] Run the flake-regressions test suite

---
 .github/workflows/ci.yml     | 20 ++++++++++++++++++++
 scripts/flake-regressions.sh | 27 +++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100755 scripts/flake-regressions.sh

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1aa3b776e..a0235eb0f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -176,3 +176,23 @@ jobs:
       - uses: DeterminateSystems/nix-installer-action@main
       - uses: DeterminateSystems/magic-nix-cache-action@main
       - run: nix build -L .#hydraJobs.tests.githubFlakes .#hydraJobs.tests.tarballFlakes
+
+  flake_regressions:
+    needs: vm_tests
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout nix
+        uses: actions/checkout@v4
+      - name: Checkout flake-regressions
+        uses: actions/checkout@v4
+        with:
+          repository: DeterminateSystems/flake-regressions
+          path: flake-regressions
+      - name: Checkout flake-regressions-data
+        uses: actions/checkout@v4
+        with:
+          repository: DeterminateSystems/flake-regressions-data
+          path: flake-regressions/tests
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+      - run: nix build --out-link ./new-nix && PATH=$(pwd)/new-nix/bin:$PATH scripts/flake-regressions.sh
diff --git a/scripts/flake-regressions.sh b/scripts/flake-regressions.sh
new file mode 100755
index 000000000..e6cfbfa24
--- /dev/null
+++ b/scripts/flake-regressions.sh
@@ -0,0 +1,27 @@
+#! /usr/bin/env bash
+
+set -e
+
+echo "Nix version:"
+nix --version
+
+cd flake-regressions
+
+status=0
+
+flakes=$(ls -d tests/*/*/* | head -n25)
+
+echo "Running flake tests..."
+
+for flake in $flakes; do
+
+    if ! REGENERATE=0 ./eval-flake.sh $flake; then
+        status=1
+        echo "❌ $flake"
+    else
+        echo "✅ $flake"
+    fi
+
+done
+
+exit "$status"

From 0eec60968ad393281ae9e31f84f2cbc15fe0bc2f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 14 May 2024 15:58:37 +0200
Subject: [PATCH 2/4] flake-regressions.sh: Make the sort order deterministic

---
 scripts/flake-regressions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/flake-regressions.sh b/scripts/flake-regressions.sh
index e6cfbfa24..5cc55bf4f 100755
--- a/scripts/flake-regressions.sh
+++ b/scripts/flake-regressions.sh
@@ -9,7 +9,7 @@ cd flake-regressions
 
 status=0
 
-flakes=$(ls -d tests/*/*/* | head -n25)
+flakes=$(ls -d tests/*/*/* | sort | head -n25)
 
 echo "Running flake tests..."
 

From 6f3d2daee66e8de80faa45e1a30abbabcc08764a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 10 Jun 2024 15:16:41 +0200
Subject: [PATCH 3/4] Fix spellcheck

---
 scripts/flake-regressions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/flake-regressions.sh b/scripts/flake-regressions.sh
index 5cc55bf4f..d76531134 100755
--- a/scripts/flake-regressions.sh
+++ b/scripts/flake-regressions.sh
@@ -9,13 +9,13 @@ cd flake-regressions
 
 status=0
 
-flakes=$(ls -d tests/*/*/* | sort | head -n25)
+flakes=$(find tests -mindepth 3 -maxdepth 3 -type d -not -path '*/.*' | sort | head -n25)
 
 echo "Running flake tests..."
 
 for flake in $flakes; do
 
-    if ! REGENERATE=0 ./eval-flake.sh $flake; then
+    if ! REGENERATE=0 ./eval-flake.sh "$flake"; then
         status=1
         echo "❌ $flake"
     else

From d4a70b67a0d76328644ab975ef0f714b1f28c2cd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 21 Jun 2024 15:38:03 +0200
Subject: [PATCH 4/4] Move flake-regressions repos to the NixOS org

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a0235eb0f..6f0b63eaa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -186,12 +186,12 @@ jobs:
       - name: Checkout flake-regressions
         uses: actions/checkout@v4
         with:
-          repository: DeterminateSystems/flake-regressions
+          repository: NixOS/flake-regressions
           path: flake-regressions
       - name: Checkout flake-regressions-data
         uses: actions/checkout@v4
         with:
-          repository: DeterminateSystems/flake-regressions-data
+          repository: NixOS/flake-regressions-data
           path: flake-regressions/tests
       - uses: DeterminateSystems/nix-installer-action@main
       - uses: DeterminateSystems/magic-nix-cache-action@main