git.iko.soy/typeable/nixpkgs
on master help sign in
meta.tests: drop `meta.needsVMSupport`

Its job is already handled by `requiredSystemFeatures`

commitcae5598611e74dfebf98e67803d4935f95888500 authorLéo Gaspard <leo@gaspard.io> dateSun 11 Nov 2018, 22:47 (8 years ago) parentaade4e5
3 files changed+3−19
doc/meta.xml+2−14 nixos/lib/testing.nix−2 pkgs/stdenv/generic/check-meta.nix+1−3
doc/meta.xml+2−14
@@ -258,9 +258,8 @@ meta.platforms = stdenv.lib.platforms.linux;
258258 <para>
259259 An attribute set with as values tests. A test is a derivation, which
260260 builds successfully when the test passes, and fails to build otherwise. A
261− derivation that is a test requires some <literal>meta</literal> elements
262− to be defined: <literal>needsVMSupport</literal> (automatically filled-in
263− for NixOS tests) and <literal>timeout</literal>.
261+ derivation that is a test needs to have <literal>meta.timeout</literal>
262+ defined.
264263 </para>
265264 <para>
266265 The NixOS tests are available as <literal>nixosTests</literal> in
@@ -294,17 +293,6 @@ meta.platforms = stdenv.lib.platforms.linux;
294293 </para>
295294 </listitem>
296295 </varlistentry>
297− <varlistentry>
298− <term>
299− <varname>needsVMSupport</varname>
300− </term>
301− <listitem>
302− <para>
303− A boolan that states whether the derivation requires build-time support
304− for Virtual Machine to build successfully.
305− </para>
306− </listitem>
307− </varlistentry>
308296 <varlistentry>
309297 <term>
310298 <varname>hydraPlatforms</varname>
nixos/lib/testing.nix−2
@@ -70,8 +70,6 @@ in rec {
7070 mv $i $out/coverage-data/$(dirname $(dirname $i))
7171 done
7272 '';
73−
74− meta.needsVMSupport = true;
7573 };
7674
7775
pkgs/stdenv/generic/check-meta.nix+1−3
@@ -170,12 +170,10 @@ let
170170 name = "test";
171171 check = x: x == {} || ( # Accept {} for tests that are unsupported
172172 isDerivation x &&
173− x ? meta.timeout &&
174− x ? meta.needsVMSupport
173+ x ? meta.timeout
175174 );
176175 merge = lib.options.mergeOneOption;
177176 });
178− needsVMSupport = bool;
179177 timeout = int;
180178
181179 # Weirder stuff that doesn't appear in the documentation?