Pin nixpkgs in extra-tests

ipetkov · Aug 29, 2024 · 657f3cf · 657f3cf
1 parent 60ac1e1
commit 657f3cf
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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