nixos/testing: Add pkgs parameter

This parameter is for packages to use in VMs, unlike hostPkgs.
This commit is contained in:
Robert Hensing 2022-06-06 21:19:22 +02:00
parent 124b0c4abc
commit a958a4aa00
4 changed files with 15 additions and 3 deletions

View File

@ -177,6 +177,7 @@ rec {
./testing/name.nix ./testing/name.nix
./testing/network.nix ./testing/network.nix
./testing/nodes.nix ./testing/nodes.nix
./testing/pkgs.nix
./testing/run.nix ./testing/run.nix
./testing/testScript.nix ./testing/testScript.nix
{ {

View 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) */
};
};
}

View File

@ -1,4 +1,4 @@
import ./make-test-python.nix ({ pkgs, ...} : { { lib, pkgs, ... }: {
name = "3proxy"; name = "3proxy";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ misuzu ]; 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" "${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"
) )
''; '';
}) }

View File

@ -44,7 +44,7 @@ let
; ;
in { in {
_3proxy = handleTest ./3proxy.nix {}; _3proxy = runTest ./3proxy.nix;
acme = handleTest ./acme.nix {}; acme = handleTest ./acme.nix {};
adguardhome = handleTest ./adguardhome.nix {}; adguardhome = handleTest ./adguardhome.nix {};
aesmd = handleTest ./aesmd.nix {}; aesmd = handleTest ./aesmd.nix {};