Merge pull request #213784 from hercules-ci/hydra-tests-pkg-config

Run the defaultPkgConfigPackages tests on hydra
2023-02-01 10:24:31 +03:00
parent 1ade249aaf 9520feaf76
commit 8e59cdf93b
2 changed files with 2 additions and 1 deletions
@@ -17,6 +17,7 @@ let
        if (builtins.tryEval attrs.drvPath).success
        then { inherit (attrs) name drvPath; }
        else { failed = true; }
+      else if attrs == null then {}
      else { recurseForDerivations = true; } //
           mapAttrs (n: v: let path' = path ++ [n]; in trace path' (recurse path' v)) attrs
    else { };
@@ -42,4 +42,4 @@ let
    else testers.hasPkgConfigModule { inherit moduleName; package = pkg; };

 in
-  allTests // { inherit tests-combined; }
+  lib.recurseIntoAttrs allTests // { inherit tests-combined; }