git.iko.soy/typeable/nixpkgs
on master help sign in
nixos-build-vms: use the driverInteractive attribute instead

This reverts commit aab534b894c60e69199aba4cc57b8b3f8fd1a8c2 & uses the driverInteractive attribute for the test driver instead. This has the same effect but removes the extra module in the nixos-build-vms code.

commitd4fb7daafdc694d01befebe7d941bfd729568ccb authorAndreas Rammhold <andreas@rammhold.de> dateSun 25 Oct 2020, 00:59 (6 years ago) parent73635b8
1 file changed+2−7
nixos/modules/installer/tools/nixos-build-vms/build-vms.nix+2−7
nixos/modules/installer/tools/nixos-build-vms/build-vms.nix+2−7
@@ -6,12 +6,7 @@
66let
77 nodes = builtins.mapAttrs (vm: module: {
88 _file = "${networkExpr}@node-${vm}";
9− imports = [
10− module
11− ({ pkgs, ... }: {
12− virtualisation.qemu.package = pkgs.qemu;
13− })
14− ];
9+ imports = [ module ];
1510 }) (import networkExpr);
1611in
1712
@@ -20,4 +15,4 @@ with import ../../../../lib/testing-python.nix {
2015 pkgs = import ../../../../.. { inherit system config; };
2116};
2217
23−(makeTest { inherit nodes; testScript = ""; }).driver
18+(makeTest { inherit nodes; testScript = ""; }).driverInteractive