public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #101473 from Ma27/nixos-build-vms-qemu

Browse Source 
nixos/nixos-build-vms: use `pkgs.qemu` for virtualisation
This commit is contained in:
Maximilian Bosch 2020-10-24 14:43:52 +02:00 committed by GitHub
commit 48612c79b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/installer/tools/nixos-build-vms/build-vms.nix
View File

@ -6,7 +6,12 @@
let let
nodes = builtins.mapAttrs (vm: module: { nodes = builtins.mapAttrs (vm: module: {
_file = "${networkExpr}@node-${vm}"; _file = "${networkExpr}@node-${vm}";
imports = [ module ]; imports = [
module
({ pkgs, ... }: {
virtualisation.qemu.package = pkgs.qemu;
})
];
}) (import networkExpr); }) (import networkExpr);
in in

2
nixos/modules/testing/test-instrumentation.nix
View File

@ -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 # or declare virtualisation.qemu.console option in a module that's always imported
virtualisation.qemu = { virtualisation.qemu = {
consoles = lib.optional (options ? virtualisation.qemu.consoles) qemuSerialDevice; consoles = lib.optional (options ? virtualisation.qemu.consoles) qemuSerialDevice;
package = pkgs.qemu_test; package = lib.mkDefault pkgs.qemu_test;
}; };
boot.initrd.preDeviceCommands = boot.initrd.preDeviceCommands =