diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2020-10-25 00:59:59 +0200 |
|---|---|---|
| committer | Andreas Rammhold <andreas@rammhold.de> | 2020-10-25 20:14:53 +0100 |
| commit | d4fb7daafdc694d01befebe7d941bfd729568ccb (patch) | |
| tree | 1018037cc6cffe918a5cf31c152ccb2ebcd35011 /nixos/modules/installer/tools/nixos-build-vms | |
| parent | 73635b859d75a0789623969adef9e46cc4b34e23 (diff) | |
| download | nixpkgs-d4fb7daafdc694d01befebe7d941bfd729568ccb.tar nixpkgs-d4fb7daafdc694d01befebe7d941bfd729568ccb.tar.gz nixpkgs-d4fb7daafdc694d01befebe7d941bfd729568ccb.tar.bz2 nixpkgs-d4fb7daafdc694d01befebe7d941bfd729568ccb.tar.lz nixpkgs-d4fb7daafdc694d01befebe7d941bfd729568ccb.tar.xz nixpkgs-d4fb7daafdc694d01befebe7d941bfd729568ccb.tar.zst nixpkgs-d4fb7daafdc694d01befebe7d941bfd729568ccb.zip | |
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.
Diffstat (limited to 'nixos/modules/installer/tools/nixos-build-vms')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-build-vms/build-vms.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix index 199e5f9206b..e49ceba2424 100644 --- a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix +++ b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix @@ -6,12 +6,7 @@ let nodes = builtins.mapAttrs (vm: module: { _file = "${networkExpr}@node-${vm}"; - imports = [ - module - ({ pkgs, ... }: { - virtualisation.qemu.package = pkgs.qemu; - }) - ]; + imports = [ module ]; }) (import networkExpr); in @@ -20,4 +15,4 @@ with import ../../../../lib/testing-python.nix { pkgs = import ../../../../.. { inherit system config; }; }; -(makeTest { inherit nodes; testScript = ""; }).driver +(makeTest { inherit nodes; testScript = ""; }).driverInteractive |