diff options
| author | Léo Gaspard <leo@gaspard.io> | 2018-11-11 22:47:49 +0900 |
|---|---|---|
| committer | Léo Gaspard <leo@gaspard.io> | 2018-11-11 23:11:46 +0900 |
| commit | cae5598611e74dfebf98e67803d4935f95888500 (patch) | |
| tree | a75a593807380f2be45f92fa101b6080e1ef5276 | |
| parent | aade4e577bbb27f044217c51a006ab6ba544ebb5 (diff) | |
meta.tests: drop `meta.needsVMSupport`
Its job is already handled by `requiredSystemFeatures`
| -rw-r--r-- | doc/meta.xml | 16 | ||||
| -rw-r--r-- | nixos/lib/testing.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 4 |
3 files changed, 3 insertions, 19 deletions
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; <para> 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 <literal>meta</literal> elements - to be defined: <literal>needsVMSupport</literal> (automatically filled-in - for NixOS tests) and <literal>timeout</literal>. + derivation that is a test needs to have <literal>meta.timeout</literal> + defined. </para> <para> The NixOS tests are available as <literal>nixosTests</literal> in @@ -296,17 +295,6 @@ meta.platforms = stdenv.lib.platforms.linux; </varlistentry> <varlistentry> <term> - <varname>needsVMSupport</varname> - </term> - <listitem> - <para> - A boolan that states whether the derivation requires build-time support - for Virtual Machine to build successfully. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> <varname>hydraPlatforms</varname> </term> <listitem> 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? |