From 657f3cf1ab715daff438c6afa529ed42dd992754 Mon Sep 17 00:00:00 2001
From: Ivan Petkov <ivanppetkov@gmail.com>
Date: Thu, 29 Aug 2024 16:15:44 -0700
Subject: [PATCH] Pin nixpkgs in extra-tests

---
 extra-tests/alt-store/flake.nix                              | 2 +-
 extra-tests/alt-store/test.sh                                | 5 ++++-
 .../dummy-does-not-depend-on-flake-source-via-path/flake.nix | 2 +-
 .../dummy-does-not-depend-on-flake-source-via-path/test.sh   | 3 ++-
 .../dummy-does-not-depend-on-flake-source-via-self/flake.nix | 2 +-
 .../dummy-does-not-depend-on-flake-source-via-self/test.sh   | 3 ++-
 extra-tests/fetch-cargo-git/flake.nix                        | 2 +-
 extra-tests/fetch-cargo-git/test.sh                          | 3 ++-
 8 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/extra-tests/alt-store/flake.nix b/extra-tests/alt-store/flake.nix
index d7d2198e..df9dd724 100644
--- a/extra-tests/alt-store/flake.nix
+++ b/extra-tests/alt-store/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     crane.url = "github:ipetkov/crane";
-    nixpkgs.follows = "crane/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
diff --git a/extra-tests/alt-store/test.sh b/extra-tests/alt-store/test.sh
index f8c4024b..8b1a610e 100755
--- a/extra-tests/alt-store/test.sh
+++ b/extra-tests/alt-store/test.sh
@@ -5,11 +5,14 @@ set -eu
 scriptDir=$(dirname "$0")
 cd "${scriptDir}"
 
+nixpkgsOverride="$(../../ci/ref-from-lock.sh ../../test#nixpkgs)"
+craneOverride="--override-input crane ../.. --override-input nixpkgs ${nixpkgsOverride}"
+
 case "$(nix --version)" in
   "nix (Nix) 2.21.0" | "nix (Nix) 2.21.1")
     echo 'skipping test: https://github.com/NixOS/nix/issues/10267'
     ;;
 
-  *) nix build .#default --override-input crane ../.. --store $(pwd)/alt-store
+  *) nix build .#default ${craneOverride} --store $(pwd)/alt-store
     ;;
 esac
diff --git a/extra-tests/dummy-does-not-depend-on-flake-source-via-path/flake.nix b/extra-tests/dummy-does-not-depend-on-flake-source-via-path/flake.nix
index 13fd0dcf..c37252b3 100644
--- a/extra-tests/dummy-does-not-depend-on-flake-source-via-path/flake.nix
+++ b/extra-tests/dummy-does-not-depend-on-flake-source-via-path/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     crane.url = "github:ipetkov/crane";
-    nixpkgs.follows = "crane/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
diff --git a/extra-tests/dummy-does-not-depend-on-flake-source-via-path/test.sh b/extra-tests/dummy-does-not-depend-on-flake-source-via-path/test.sh
index bad02285..b6af38d0 100755
--- a/extra-tests/dummy-does-not-depend-on-flake-source-via-path/test.sh
+++ b/extra-tests/dummy-does-not-depend-on-flake-source-via-path/test.sh
@@ -5,7 +5,8 @@ set -eu
 scriptDir=$(dirname "$0")
 cd "${scriptDir}"
 
-craneOverride="--override-input crane ../.."
+nixpkgsOverride="$(../../ci/ref-from-lock.sh ../../test#nixpkgs)"
+craneOverride="--override-input crane ../.. --override-input nixpkgs ${nixpkgsOverride}"
 flakeSrc=$(nix flake metadata ${craneOverride} --json 2>/dev/null | jq -r '.path')
 
 # Get information about the default derivation
diff --git a/extra-tests/dummy-does-not-depend-on-flake-source-via-self/flake.nix b/extra-tests/dummy-does-not-depend-on-flake-source-via-self/flake.nix
index 78f21125..eb1df880 100644
--- a/extra-tests/dummy-does-not-depend-on-flake-source-via-self/flake.nix
+++ b/extra-tests/dummy-does-not-depend-on-flake-source-via-self/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     crane.url = "github:ipetkov/crane";
-    nixpkgs.follows = "crane/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
diff --git a/extra-tests/dummy-does-not-depend-on-flake-source-via-self/test.sh b/extra-tests/dummy-does-not-depend-on-flake-source-via-self/test.sh
index bad02285..b6af38d0 100755
--- a/extra-tests/dummy-does-not-depend-on-flake-source-via-self/test.sh
+++ b/extra-tests/dummy-does-not-depend-on-flake-source-via-self/test.sh
@@ -5,7 +5,8 @@ set -eu
 scriptDir=$(dirname "$0")
 cd "${scriptDir}"
 
-craneOverride="--override-input crane ../.."
+nixpkgsOverride="$(../../ci/ref-from-lock.sh ../../test#nixpkgs)"
+craneOverride="--override-input crane ../.. --override-input nixpkgs ${nixpkgsOverride}"
 flakeSrc=$(nix flake metadata ${craneOverride} --json 2>/dev/null | jq -r '.path')
 
 # Get information about the default derivation
diff --git a/extra-tests/fetch-cargo-git/flake.nix b/extra-tests/fetch-cargo-git/flake.nix
index d26b6a93..f94163a1 100644
--- a/extra-tests/fetch-cargo-git/flake.nix
+++ b/extra-tests/fetch-cargo-git/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     crane.url = "github:ipetkov/crane";
-    nixpkgs.follows = "crane/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
diff --git a/extra-tests/fetch-cargo-git/test.sh b/extra-tests/fetch-cargo-git/test.sh
index 5e861464..8bf1ba74 100755
--- a/extra-tests/fetch-cargo-git/test.sh
+++ b/extra-tests/fetch-cargo-git/test.sh
@@ -5,7 +5,8 @@ set -eu
 scriptDir=$(dirname "$0")
 cd "${scriptDir}"
 
-craneOverride="--override-input crane ../.."
+nixpkgsOverride="$(../../ci/ref-from-lock.sh ../../test#nixpkgs)"
+craneOverride="--override-input crane ../.. --override-input nixpkgs ${nixpkgsOverride}"
 
 # Try fetching the git verision of cargo
 nix build ${craneOverride} .#cargo-git