diff --git a/integration-tests/allow-apply-all/default.nix b/integration-tests/allow-apply-all/default.nix index bed21a5..5afd020 100644 --- a/integration-tests/allow-apply-all/default.nix +++ b/integration-tests/allow-apply-all/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import ../nixpkgs.nix }: +{ pkgs }: let tools = pkgs.callPackage ../tools.nix { diff --git a/integration-tests/apply-local/default.nix b/integration-tests/apply-local/default.nix index c7ed099..a5345e6 100644 --- a/integration-tests/apply-local/default.nix +++ b/integration-tests/apply-local/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import ../nixpkgs.nix }: +{ pkgs }: let tools = pkgs.callPackage ../tools.nix { diff --git a/integration-tests/apply/default.nix b/integration-tests/apply/default.nix index 366e5cb..53ff97d 100644 --- a/integration-tests/apply/default.nix +++ b/integration-tests/apply/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import ../nixpkgs.nix +{ pkgs , evaluator ? "chunked" }: diff --git a/integration-tests/build-on-target/default.nix b/integration-tests/build-on-target/default.nix index 0e29754..f52f441 100644 --- a/integration-tests/build-on-target/default.nix +++ b/integration-tests/build-on-target/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import ../nixpkgs.nix }: +{ pkgs }: let tools = pkgs.callPackage ../tools.nix { diff --git a/integration-tests/default.nix b/integration-tests/default.nix index 5472b7d..4fdaa39 100644 --- a/integration-tests/default.nix +++ b/integration-tests/default.nix @@ -1,14 +1,18 @@ +{ pkgs ? import ./nixpkgs.nix +, pkgsStable ? import ./nixpkgs-stable.nix +}: + { - apply = import ./apply {}; - apply-streaming = import ./apply { evaluator = "streaming"; }; - apply-local = import ./apply-local {}; - build-on-target = import ./build-on-target {}; - exec = import ./exec {}; - flakes = import ./flakes {}; - flakes-streaming = import ./flakes { evaluator = "streaming"; }; - parallel = import ./parallel {}; + apply = import ./apply { inherit pkgs; }; + apply-streaming = import ./apply { inherit pkgs; evaluator = "streaming"; }; + apply-local = import ./apply-local { inherit pkgs; }; + build-on-target = import ./build-on-target { inherit pkgs; }; + exec = import ./exec { inherit pkgs; }; + flakes = import ./flakes { inherit pkgs; }; + flakes-streaming = import ./flakes { inherit pkgs; evaluator = "streaming"; }; + parallel = import ./parallel { inherit pkgs; }; - allow-apply-all = import ./allow-apply-all {}; + allow-apply-all = import ./allow-apply-all { inherit pkgs; }; - apply-stable = import ./apply { pkgs = import ./nixpkgs-stable.nix; }; + apply-stable = import ./apply { pkgs = pkgsStable; }; } diff --git a/integration-tests/exec/default.nix b/integration-tests/exec/default.nix index 99916c0..23e1823 100644 --- a/integration-tests/exec/default.nix +++ b/integration-tests/exec/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import ../nixpkgs.nix }: +{ pkgs }: let tools = pkgs.callPackage ../tools.nix {}; diff --git a/integration-tests/flakes/default.nix b/integration-tests/flakes/default.nix index 74fb265..2f3f3c7 100644 --- a/integration-tests/flakes/default.nix +++ b/integration-tests/flakes/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import ../nixpkgs.nix +{ pkgs , evaluator ? "chunked" }: diff --git a/integration-tests/parallel/default.nix b/integration-tests/parallel/default.nix index 1c01e45..70434b1 100644 --- a/integration-tests/parallel/default.nix +++ b/integration-tests/parallel/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? import ../nixpkgs.nix }: +{ pkgs }: let tools = pkgs.callPackage ../tools.nix {};