diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-12 18:59:08 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-12 18:59:08 +0100 |
| commit | daf3297cb46f73522d021e22c4dc7e0eb6920333 (patch) | |
| tree | 75d39f6f6933dafd9ac36e4082526075906271c1 /pkgs/stdenv/generic | |
| parent | 917400bcffd3a4179c4789a91857a5f1420081dd (diff) | |
| parent | 968b20e2c7405f27830b6f10a8cac975e965dc94 (diff) | |
| download | nixpkgs-daf3297cb46f73522d021e22c4dc7e0eb6920333.tar nixpkgs-daf3297cb46f73522d021e22c4dc7e0eb6920333.tar.gz nixpkgs-daf3297cb46f73522d021e22c4dc7e0eb6920333.tar.bz2 nixpkgs-daf3297cb46f73522d021e22c4dc7e0eb6920333.tar.lz nixpkgs-daf3297cb46f73522d021e22c4dc7e0eb6920333.tar.xz nixpkgs-daf3297cb46f73522d021e22c4dc7e0eb6920333.tar.zst nixpkgs-daf3297cb46f73522d021e22c4dc7e0eb6920333.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv/generic')
| -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 0e93df85547..d09dff10b27 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? |