diff --git a/doc/meta.xml b/doc/meta.xml index 51c7b2dfc88f..a7e467a78cbd 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -258,9 +258,8 @@ meta.platforms = stdenv.lib.platforms.linux; An attribute set with as values tests. A test is a derivation, which builds successfully when the test passes, and fails to build otherwise. A - derivation that is a test requires some meta elements - to be defined: needsVMSupport (automatically filled-in - for NixOS tests) and timeout. + derivation that is a test needs to have meta.timeout + defined. The NixOS tests are available as nixosTests in @@ -294,17 +293,6 @@ meta.platforms = stdenv.lib.platforms.linux; - - - needsVMSupport - - - - A boolan that states whether the derivation requires build-time support - for Virtual Machine to build successfully. - - - hydraPlatforms diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index d26d4a91924b..f90fc9f7df0e 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -70,8 +70,6 @@ in rec { mv $i $out/coverage-data/$(dirname $(dirname $i)) done ''; - - meta.needsVMSupport = true; }; diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 359e499cc964..301080f0f906 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -170,12 +170,10 @@ let name = "test"; check = x: x == {} || ( # Accept {} for tests that are unsupported isDerivation x && - x ? meta.timeout && - x ? meta.needsVMSupport + x ? meta.timeout ); merge = lib.options.mergeOneOption; }); - needsVMSupport = bool; timeout = int; # Weirder stuff that doesn't appear in the documentation?