meta.tests: drop meta.needsVMSupport

Its job is already handled by `requiredSystemFeatures`
This commit is contained in:
Léo Gaspard 2018-11-11 22:47:49 +09:00
parent aade4e577b
commit cae5598611
No known key found for this signature in database
GPG Key ID: 8A55848B6090F9CF
3 changed files with 3 additions and 19 deletions

View File

@ -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
@ -294,17 +293,6 @@ meta.platforms = stdenv.lib.platforms.linux;
</para>
</listitem>
</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>

View File

@ -70,8 +70,6 @@ in rec {
mv $i $out/coverage-data/$(dirname $(dirname $i))
done
'';
meta.needsVMSupport = true;
};

View File

@ -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?