diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-10-24 14:43:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-24 14:43:52 +0200 |
| commit | 48612c79b1d491b0a0ff37c10e73ab64611e94e5 (patch) | |
| tree | f747576dd16e3bda7aee05b97b5c7a739083f465 /nixos | |
| parent | 49701c3bf81550ffb2897d840ad641debefec753 (diff) | |
| parent | aab534b894c60e69199aba4cc57b8b3f8fd1a8c2 (diff) | |
| download | nixpkgs-48612c79b1d491b0a0ff37c10e73ab64611e94e5.tar nixpkgs-48612c79b1d491b0a0ff37c10e73ab64611e94e5.tar.gz nixpkgs-48612c79b1d491b0a0ff37c10e73ab64611e94e5.tar.bz2 nixpkgs-48612c79b1d491b0a0ff37c10e73ab64611e94e5.tar.lz nixpkgs-48612c79b1d491b0a0ff37c10e73ab64611e94e5.tar.xz nixpkgs-48612c79b1d491b0a0ff37c10e73ab64611e94e5.tar.zst nixpkgs-48612c79b1d491b0a0ff37c10e73ab64611e94e5.zip | |
Merge pull request #101473 from Ma27/nixos-build-vms-qemu
nixos/nixos-build-vms: use `pkgs.qemu` for virtualisation
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-build-vms/build-vms.nix | 7 | ||||
| -rw-r--r-- | nixos/modules/testing/test-instrumentation.nix | 2 |
2 files changed, 7 insertions, 2 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 0c9f8522cc1..199e5f9206b 100644 --- a/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix +++ b/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix @@ -6,7 +6,12 @@ let nodes = builtins.mapAttrs (vm: module: { _file = "${networkExpr}@node-${vm}"; - imports = [ module ]; + imports = [ + module + ({ pkgs, ... }: { + virtualisation.qemu.package = pkgs.qemu; + }) + ]; }) (import networkExpr); in diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index e9f5eac7f5f..2986bd4c4e3 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -53,7 +53,7 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; }; # or declare virtualisation.qemu.console option in a module that's always imported virtualisation.qemu = { consoles = lib.optional (options ? virtualisation.qemu.consoles) qemuSerialDevice; - package = pkgs.qemu_test; + package = lib.mkDefault pkgs.qemu_test; }; boot.initrd.preDeviceCommands = |