diff options
author | Timo Kaufmann <timokau@zoho.com> | 2018-11-07 00:05:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-07 00:05:22 +0100 |
commit | 6141939d6e0a77c84905efd560c03c3032164ef1 (patch) | |
tree | 57930c5d117d67174ca6ba7f2219549eb4c2c116 /pkgs/stdenv | |
parent | 13892da3e76351e0a280fa390e8cb49b1b8b9265 (diff) | |
parent | 02e1f00ffdd0c1a74fbc0be5f314b8921b0c9165 (diff) | |
download | nixlib-6141939d6e0a77c84905efd560c03c3032164ef1.tar nixlib-6141939d6e0a77c84905efd560c03c3032164ef1.tar.gz nixlib-6141939d6e0a77c84905efd560c03c3032164ef1.tar.bz2 nixlib-6141939d6e0a77c84905efd560c03c3032164ef1.tar.lz nixlib-6141939d6e0a77c84905efd560c03c3032164ef1.tar.xz nixlib-6141939d6e0a77c84905efd560c03c3032164ef1.tar.zst nixlib-6141939d6e0a77c84905efd560c03c3032164ef1.zip |
Merge pull request #44439 from Ekleog/meta-tests
[RFC] Use `meta.tests` to link from packages to the tests that test them
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 26cd9f8beb96..0e93df855471 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -165,6 +165,16 @@ let platforms = listOf (either str lib.systems.parsedPlatform.types.system); hydraPlatforms = listOf str; broken = bool; + # TODO: refactor once something like Profpatsch's types-simple will land + tests = attrsOf (mkOptionType { + name = "test"; + check = x: isDerivation x && + x ? meta.timeout && + x ? meta.needsVMSupport; + merge = lib.options.mergeOneOption; + }); + needsVMSupport = bool; + timeout = int; # Weirder stuff that doesn't appear in the documentation? knownVulnerabilities = listOf str; @@ -184,8 +194,6 @@ let isIbusEngine = bool; isGutenprint = bool; badPlatforms = platforms; - # Hydra build timeout - timeout = int; }; checkMetaAttr = k: v: |