meta.tests: drop `meta.needsVMSupport`
Its job is already handled by `requiredSystemFeatures`
This commit is contained in:
parent
aade4e577b
commit
cae5598611
16
doc/meta.xml
16
doc/meta.xml
|
@ -258,9 +258,8 @@ meta.platforms = stdenv.lib.platforms.linux;
|
||||||
<para>
|
<para>
|
||||||
An attribute set with as values tests. A test is a derivation, which
|
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
|
builds successfully when the test passes, and fails to build otherwise. A
|
||||||
derivation that is a test requires some <literal>meta</literal> elements
|
derivation that is a test needs to have <literal>meta.timeout</literal>
|
||||||
to be defined: <literal>needsVMSupport</literal> (automatically filled-in
|
defined.
|
||||||
for NixOS tests) and <literal>timeout</literal>.
|
|
||||||
</para>
|
</para>
|
||||||
<para>
|
<para>
|
||||||
The NixOS tests are available as <literal>nixosTests</literal> in
|
The NixOS tests are available as <literal>nixosTests</literal> in
|
||||||
|
@ -294,17 +293,6 @@ meta.platforms = stdenv.lib.platforms.linux;
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</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>
|
<varlistentry>
|
||||||
<term>
|
<term>
|
||||||
<varname>hydraPlatforms</varname>
|
<varname>hydraPlatforms</varname>
|
||||||
|
|
|
@ -70,8 +70,6 @@ in rec {
|
||||||
mv $i $out/coverage-data/$(dirname $(dirname $i))
|
mv $i $out/coverage-data/$(dirname $(dirname $i))
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta.needsVMSupport = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -170,12 +170,10 @@ let
|
||||||
name = "test";
|
name = "test";
|
||||||
check = x: x == {} || ( # Accept {} for tests that are unsupported
|
check = x: x == {} || ( # Accept {} for tests that are unsupported
|
||||||
isDerivation x &&
|
isDerivation x &&
|
||||||
x ? meta.timeout &&
|
x ? meta.timeout
|
||||||
x ? meta.needsVMSupport
|
|
||||||
);
|
);
|
||||||
merge = lib.options.mergeOneOption;
|
merge = lib.options.mergeOneOption;
|
||||||
});
|
});
|
||||||
needsVMSupport = bool;
|
|
||||||
timeout = int;
|
timeout = int;
|
||||||
|
|
||||||
# Weirder stuff that doesn't appear in the documentation?
|
# Weirder stuff that doesn't appear in the documentation?
|
||||||
|
|
Loading…
Reference in New Issue