about summary refs log tree commit diff
path: root/nixos/modules/testing
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-10-23 17:33:10 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2020-10-23 17:37:57 +0200
commitaab534b894c60e69199aba4cc57b8b3f8fd1a8c2 (patch)
tree97eafd6fa5c7d9c8c1e8bf9b26de4933b848f77c /nixos/modules/testing
parent972ba804fd347c86db110837788157679b3815f0 (diff)
downloadnixlib-aab534b894c60e69199aba4cc57b8b3f8fd1a8c2.tar
nixlib-aab534b894c60e69199aba4cc57b8b3f8fd1a8c2.tar.gz
nixlib-aab534b894c60e69199aba4cc57b8b3f8fd1a8c2.tar.bz2
nixlib-aab534b894c60e69199aba4cc57b8b3f8fd1a8c2.tar.lz
nixlib-aab534b894c60e69199aba4cc57b8b3f8fd1a8c2.tar.xz
nixlib-aab534b894c60e69199aba4cc57b8b3f8fd1a8c2.tar.zst
nixlib-aab534b894c60e69199aba4cc57b8b3f8fd1a8c2.zip
nixos/nixos-build-vms: use `pkgs.qemu` for virtualisation
When I test a change e.g. in the module system manually, I usually use
`nixos-build-vms(8)` which also gives me a QEMU window where I can play
around in the freshly built VM.

It seems as this has changed recently when the default package for
non-interactive VM tests using the same framework was switched to
`pkgs.qemu_test` to reduce the closure size. While this is a reasonable
decision for our CI tests, I think that you really want a QEMU window of
the VM by default when using `nixos-build-vms(8)`.

[1] bc2188b083dfbbe749a221023e2960b60d4c8951
Diffstat (limited to 'nixos/modules/testing')
-rw-r--r--nixos/modules/testing/test-instrumentation.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index e9f5eac7f5f4..2986bd4c4e31 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 =