lol

nixos/testing: Add pkgs parameter

This parameter is for packages to use in VMs, unlike hostPkgs.

+15 -3
+1
nixos/lib/testing-python.nix
··· 177 177 ./testing/name.nix 178 178 ./testing/network.nix 179 179 ./testing/nodes.nix 180 + ./testing/pkgs.nix 180 181 ./testing/run.nix 181 182 ./testing/testScript.nix 182 183 {
+11
nixos/lib/testing/pkgs.nix
··· 1 + { config, lib, hostPkgs, ... }: 2 + { 3 + config = { 4 + # default pkgs for use in VMs 5 + _module.args.pkgs = hostPkgs; 6 + 7 + defaults = { 8 + # TODO: a module to set a shared pkgs, if options.nixpkgs.* is untouched by user (highestPrio) */ 9 + }; 10 + }; 11 + }
+2 -2
nixos/tests/3proxy.nix
··· 1 - import ./make-test-python.nix ({ pkgs, ...} : { 1 + { lib, pkgs, ... }: { 2 2 name = "3proxy"; 3 3 meta = with pkgs.lib.maintainers; { 4 4 maintainers = [ misuzu ]; ··· 186 186 "${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" 187 187 ) 188 188 ''; 189 - }) 189 + }
+1 -1
nixos/tests/all-tests.nix
··· 44 44 ; 45 45 46 46 in { 47 - _3proxy = handleTest ./3proxy.nix {}; 47 + _3proxy = runTest ./3proxy.nix; 48 48 acme = handleTest ./acme.nix {}; 49 49 adguardhome = handleTest ./adguardhome.nix {}; 50 50 aesmd = handleTest ./aesmd.nix {};