JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
f4d7493162
nixpkgs/nixos/modules
History
Andreas Rammhold f4d7493162
nixos/tests: only apply qemu parameters if the options are defined 
This fixes an eval error that occurred on hydra with the small channel
and the `nixos.tests.boot.biosCdrom.x86_64-linux` attribute:

> $ nix-instantiate nixos/release-small.nix -A nixos.tests.boot.biosCdrom.x86_64-linux
> warning: unknown setting 'experimental-features'
> error: The option `virtualisation.qemu' does not exist. Definition values:
> - In `/home/andi/dev/nixos/nixpkgs/nixos/modules/testing/test-instrumentation.nix':
>     {
>       consoles = [ ];
>       package = {
> 	_type = "override";
> 	content = <derivation /nix/store/q72h2cdcb9zjgiay5gdgzwddjkbjr7xq-qemu-host-cpu-only-for-vm-tests-5.1.0.drv>;
>     ...
> (use '--show-trace' to show detailed location information)

In bc2188b we changed test test-instrumentation to also set the QEMU
package that is being used. That change unfortunately caused us to
always assing values to the virtualisation.qemu.package option even when
the option is not defined. The original code was explicitly testing for
the consoles case but the then newly extended version did not adjust the
check as the intention was probably not clear.

With this commit we are always ensuring the entire virtualisation.qemu
section exists and can thus drop the individual tests for each of the
sections since the QEMU module always defines both the package and the
consoles option when it's root is defined..
2020-10-25 13:42:01 +01:00
..
config Merge pull request #100657 from flokli/network-manager-sstp 2020-10-21 00:33:13 +02:00
hardware Merge pull request #96511 from Zopieux/rtl_433_prom 2020-10-23 23:24:38 +02:00
i18n/input-method hime: fix enable hime, remove hime-all package 2020-10-17 10:48:31 +08:00
installer Merge pull request #100199 from worldofpeace/seeded-config 2020-10-24 11:35:33 -04:00
misc nixos/pdns-recursor: declare module user as system user 2020-10-18 08:15:29 -04:00
profiles nixos/hardened: update blacklisted filesystems 2020-09-27 06:16:58 +00:00
programs nixos/ssmtp: minor typo fix 2020-10-22 09:34:21 -07:00
security nixos/pam_mount: add pamMount attribute to users 2020-10-14 22:55:55 -07:00
services nixos/mosquitto: add passwordFile and hashedPasswordFile options 2020-10-25 10:53:38 +01:00
system nixos/initrd-network: fix /etc/resolv.conf when multiple dns servers from DHCP 2020-10-19 21:32:58 -07:00
tasks doc: Document a workaround for using an FQDN as hostname 2020-10-10 10:48:54 -07:00
testing nixos/tests: only apply qemu parameters if the options are defined 2020-10-25 13:42:01 +01:00
virtualisation nixos: fix qemu_test being used in normal VMs 2020-10-21 16:38:04 +02:00
module-list.nix Merge pull request #96511 from Zopieux/rtl_433_prom 2020-10-23 23:24:38 +02:00
rename.nix Merge pull request #91256 from prusnak/seeks 2020-09-18 16:32:33 +02:00