diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-12 19:01:36 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-12 19:01:36 +0100 |
commit | 3b052406eaaa466240b948d05b0e483272317e6a (patch) | |
tree | d4cd6ff36598c3549f4b717d22fc9b94476b326f /pkgs/stdenv | |
parent | 3fd80c6215d4403c5b2f0562c1b8d4a92c2ec291 (diff) | |
parent | daf3297cb46f73522d021e22c4dc7e0eb6920333 (diff) | |
download | nixlib-3b052406eaaa466240b948d05b0e483272317e6a.tar nixlib-3b052406eaaa466240b948d05b0e483272317e6a.tar.gz nixlib-3b052406eaaa466240b948d05b0e483272317e6a.tar.bz2 nixlib-3b052406eaaa466240b948d05b0e483272317e6a.tar.lz nixlib-3b052406eaaa466240b948d05b0e483272317e6a.tar.xz nixlib-3b052406eaaa466240b948d05b0e483272317e6a.tar.zst nixlib-3b052406eaaa466240b948d05b0e483272317e6a.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 0e93df855471..d09dff10b278 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -166,14 +166,15 @@ let hydraPlatforms = listOf str; broken = bool; # TODO: refactor once something like Profpatsch's types-simple will land + # This is currently dead code due to https://github.com/NixOS/nix/issues/2532 tests = attrsOf (mkOptionType { name = "test"; - check = x: isDerivation x && - x ? meta.timeout && - x ? meta.needsVMSupport; + check = x: x == {} || ( # Accept {} for tests that are unsupported + isDerivation x && + x ? meta.timeout + ); merge = lib.options.mergeOneOption; }); - needsVMSupport = bool; timeout = int; # Weirder stuff that doesn't appear in the documentation? |