integration-tests: Refactor pkgs

This commit is contained in:
Zhaofeng Li 2023-01-27 23:44:41 -07:00
parent 9c51ac1523
commit ddf00fec66
8 changed files with 21 additions and 17 deletions

View file

@ -1,4 +1,4 @@
{ pkgs ? import ../nixpkgs.nix }: { pkgs }:
let let
tools = pkgs.callPackage ../tools.nix { tools = pkgs.callPackage ../tools.nix {

View file

@ -1,4 +1,4 @@
{ pkgs ? import ../nixpkgs.nix }: { pkgs }:
let let
tools = pkgs.callPackage ../tools.nix { tools = pkgs.callPackage ../tools.nix {

View file

@ -1,4 +1,4 @@
{ pkgs ? import ../nixpkgs.nix { pkgs
, evaluator ? "chunked" , evaluator ? "chunked"
}: }:

View file

@ -1,4 +1,4 @@
{ pkgs ? import ../nixpkgs.nix }: { pkgs }:
let let
tools = pkgs.callPackage ../tools.nix { tools = pkgs.callPackage ../tools.nix {

View file

@ -1,14 +1,18 @@
{ pkgs ? import ./nixpkgs.nix
, pkgsStable ? import ./nixpkgs-stable.nix
}:
{ {
apply = import ./apply {}; apply = import ./apply { inherit pkgs; };
apply-streaming = import ./apply { evaluator = "streaming"; }; apply-streaming = import ./apply { inherit pkgs; evaluator = "streaming"; };
apply-local = import ./apply-local {}; apply-local = import ./apply-local { inherit pkgs; };
build-on-target = import ./build-on-target {}; build-on-target = import ./build-on-target { inherit pkgs; };
exec = import ./exec {}; exec = import ./exec { inherit pkgs; };
flakes = import ./flakes {}; flakes = import ./flakes { inherit pkgs; };
flakes-streaming = import ./flakes { evaluator = "streaming"; }; flakes-streaming = import ./flakes { inherit pkgs; evaluator = "streaming"; };
parallel = import ./parallel {}; 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; };
} }

View file

@ -1,4 +1,4 @@
{ pkgs ? import ../nixpkgs.nix }: { pkgs }:
let let
tools = pkgs.callPackage ../tools.nix {}; tools = pkgs.callPackage ../tools.nix {};

View file

@ -1,4 +1,4 @@
{ pkgs ? import ../nixpkgs.nix { pkgs
, evaluator ? "chunked" , evaluator ? "chunked"
}: }:

View file

@ -1,4 +1,4 @@
{ pkgs ? import ../nixpkgs.nix }: { pkgs }:
let let
tools = pkgs.callPackage ../tools.nix {}; tools = pkgs.callPackage ../tools.nix {};