Merge master into staging-next

2018-11-12 18:59:08 +01:00
parent 917400bcff 968b20e2c7
commit daf3297cb4
141 changed files with 1835 additions and 779 deletions
@@ -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?