This way, the package set will be possible to pass without re-importing all the timewip/yesman
parent
921b63134a
commit
6c68fbd4e1
@ -1,9 +1,13 @@ |
||||
{ system ? builtins.currentSystem |
||||
, config ? {} |
||||
, networkExpr |
||||
}: |
||||
|
||||
let nodes = import networkExpr; in |
||||
|
||||
with import ../../../../lib/testing.nix { inherit system; }; |
||||
with import ../../../../lib/testing.nix { |
||||
inherit system; |
||||
pkgs = import ../.. { inherit system config; } |
||||
}; |
||||
|
||||
(makeTest { inherit nodes; testScript = ""; }).driver |
||||
|
@ -1,5 +1,9 @@ |
||||
f: { system ? builtins.currentSystem, ... } @ args: |
||||
f: { |
||||
system ? builtins.currentSystem, |
||||
pkgs ? import ../.. { inherit system; config = {}; }, |
||||
... |
||||
} @ args: |
||||
|
||||
with import ../lib/testing.nix { inherit system; }; |
||||
with import ../lib/testing.nix { inherit system pkgs; }; |
||||
|
||||
makeTest (if pkgs.lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) |
||||
|
@ -1,6 +1,9 @@ |
||||
{ system ? builtins.currentSystem }: |
||||
{ system ? builtins.currentSystem, |
||||
config ? {}, |
||||
pkgs ? import ../../.. { inherit system config; } |
||||
}: |
||||
{ |
||||
basic = import ./basic.nix { inherit system; }; |
||||
with-postgresql-and-redis = import ./with-postgresql-and-redis.nix { inherit system; }; |
||||
with-mysql-and-memcached = import ./with-mysql-and-memcached.nix { inherit system; }; |
||||
basic = import ./basic.nix { inherit system pkgs; }; |
||||
with-postgresql-and-redis = import ./with-postgresql-and-redis.nix { inherit system pkgs; }; |
||||
with-mysql-and-memcached = import ./with-mysql-and-memcached.nix { inherit system pkgs; }; |
||||
} |
||||
|
Loading…
Reference in new issue