Merge pull request #101473 from Ma27/nixos-build-vms-qemu
nixos/nixos-build-vms: use `pkgs.qemu` for virtualisation
commit48612c79b1d491b0a0ff37c10e73ab64611e94e5
authorMaximilian Bosch <maximilian@mbosch.me>
dateSat 24 Oct 2020, 14:43 (6 years ago)
parent49701c3aab534b
nixos/modules/installer/tools/nixos-build-vms/build-vms.nix+6−1
@@ -6,7 +6,12 @@
66let
77 nodes = builtins.mapAttrs (vm: module: {
88 _file = "${networkExpr}@node-${vm}";
9− imports = [ module ];
9+ imports = [
10+ module
11+ ({ pkgs, ... }: {
12+ virtualisation.qemu.package = pkgs.qemu;
13+ })
14+ ];
1015 }) (import networkExpr);
1116in
1217
nixos/modules/testing/test-instrumentation.nix+1−1
@@ -53,7 +53,7 @@ with import ../../lib/qemu-flags.nix { inherit pkgs; };
5353 # or declare virtualisation.qemu.console option in a module that's always imported
5454 virtualisation.qemu = {
5555 consoles = lib.optional (options ? virtualisation.qemu.consoles) qemuSerialDevice;
56− package = pkgs.qemu_test;
56+ package = lib.mkDefault pkgs.qemu_test;
5757 };
5858
5959 boot.initrd.preDeviceCommands =