nixos/testing: Add pkgs parameter
This parameter is for packages to use in VMs, unlike hostPkgs.
This commit is contained in:
parent
124b0c4abc
commit
a958a4aa00
@ -177,6 +177,7 @@ rec {
|
||||
./testing/name.nix
|
||||
./testing/network.nix
|
||||
./testing/nodes.nix
|
||||
./testing/pkgs.nix
|
||||
./testing/run.nix
|
||||
./testing/testScript.nix
|
||||
{
|
||||
|
11
nixos/lib/testing/pkgs.nix
Normal file
11
nixos/lib/testing/pkgs.nix
Normal file
@ -0,0 +1,11 @@
|
||||
{ config, lib, hostPkgs, ... }:
|
||||
{
|
||||
config = {
|
||||
# default pkgs for use in VMs
|
||||
_module.args.pkgs = hostPkgs;
|
||||
|
||||
defaults = {
|
||||
# TODO: a module to set a shared pkgs, if options.nixpkgs.* is untouched by user (highestPrio) */
|
||||
};
|
||||
};
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
{ lib, pkgs, ... }: {
|
||||
name = "3proxy";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ misuzu ];
|
||||
@ -186,4 +186,4 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
||||
"${pkgs.wget}/bin/wget -e use_proxy=yes -e http_proxy=http://192.168.0.4:3128 -S -O /dev/null http://127.0.0.1:9999"
|
||||
)
|
||||
'';
|
||||
})
|
||||
}
|
||||
|
@ -44,7 +44,7 @@ let
|
||||
;
|
||||
|
||||
in {
|
||||
_3proxy = handleTest ./3proxy.nix {};
|
||||
_3proxy = runTest ./3proxy.nix;
|
||||
acme = handleTest ./acme.nix {};
|
||||
adguardhome = handleTest ./adguardhome.nix {};
|
||||
aesmd = handleTest ./aesmd.nix {};
|
||||
|
Loading…
Reference in New Issue
Block a user