check-meta: type check for tests failing WIP

nix-build -A hello
Profpatsch · Apr 1, 2018 · d74203a · d74203a · Profpatsch · Apr 9, 2018
1 parent 589d1c5
commit d74203a
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, pkgs }:
 
 stdenv.mkDerivation rec {
   name = "hello-2.10";
@@ -20,5 +20,15 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3Plus;
     maintainers = [ stdenv.lib.maintainers.eelco ];
     platforms = stdenv.lib.platforms.all;
+
+    tests = {
+      "onetestyboi" = pkgs.runCommand "hi" {
+        # meta.description = "hi";
+        passthru = {
+          isVmTest = "string";
+          foo = { a = [ [] ]; b = [ "foo" 42 ]; };
+        };
+      } ''touch $out'';
+    };
   };
 }
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
@@ -6,7 +6,7 @@
 let
   # See discussion at https://github.com/NixOS/nixpkgs/pull/25304#issuecomment-298385426
   # for why this defaults to false, but I (@copumpkin) want to default it to true soon.
-  shouldCheckMeta = config.checkMeta or false;
+  shouldCheckMeta = config.checkMeta or true; #or false;
 
   allowUnfree = config.allowUnfree or false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";
 
@@ -176,6 +176,32 @@ let
         platforms = list platform;
         hydraPlatforms = list platform;
         broken = bool;
+        tests =
+          let
+            derivationPredicate = t: restrict {
+              description = "<δ>: ${t.description}";
+              type = t;
+              check = lib.isDerivation;
+            };
+            testT = derivationPredicate (productOpt {
+              open = true;
+              opt = {};
+              req = {
+                name = string;
+                passthru = product {
+                  isVmTest = bool;
+                  foo = attrs (list string);
+                };
+                # TODO: meta should reuse metaType and add some
+                # fields to the req attribute
+                meta = productOpt {
+                  open = true;
+                  req.description = string;
+                  opt.platforms = list platform;
+                };
+              };
+            });
+          in attrs testT;
 
         # Weirder stuff that doesn't appear in the documentation?
         knownVulnerabilities = list string;