This commit is contained in:
Eelco Dolstra 2015-01-06 11:52:12 +01:00
parent ab10131663
commit fddc347689

View File

@ -62,7 +62,7 @@ rec {
/* Map an attribute of the form `foo = [platforms...]' to `testOn /* Map an attribute of the form `foo = [platforms...]' to `testOn
[platforms...] (pkgs: pkgs.foo)'. */ [platforms...] (pkgs: pkgs.foo)'. */
mapTestOn = pkgs.lib.mapAttrsRecursiveCond mapTestOn = pkgs.lib.mapAttrsRecursiveCond
(as: !(as ? type && as.type == "job")) (as: as.type or "" != "job")
(path: value: (path: value:
let let
job = toJob value; job = toJob value;
@ -74,7 +74,7 @@ rec {
* parameter for allPackages, defining the target platform for cross builds, * parameter for allPackages, defining the target platform for cross builds,
* and triggering the build of the host derivation (cross built - crossDrv). */ * and triggering the build of the host derivation (cross built - crossDrv). */
mapTestOnCross = crossSystem: pkgs.lib.mapAttrsRecursiveCond mapTestOnCross = crossSystem: pkgs.lib.mapAttrsRecursiveCond
(as: !(as ? type && as.type == "job")) (as: as.type or "" != "job")
(path: value: (path: value:
let let
job = toJob value; job = toJob value;