release-lib: forAllSupportedSystems -> forTheseSystems

I'm going to move forAllSystems from nixos/release.nix, and these
functions sound too similar while doing different things.
wip/yesman
Tuomas Tynkkynen 7 years ago
parent 822c949833
commit 82cab72dd4
  1. 2
      pkgs/top-level/release-cross.nix
  2. 6
      pkgs/top-level/release-lib.nix

@ -75,7 +75,7 @@ in
f (["buildPackages"] ++ path) { inherit system crossSystem; }
);
testEqual = path: systems: forAllSupportedSystems systems (testEqualOne path);
testEqual = path: systems: forTheseSystems systems (testEqualOne path);
mapTestEqual = lib.mapAttrsRecursive testEqual;

@ -58,7 +58,7 @@ rec {
interested in the result of cross building a package. */
crossMaintainers = [ maintainers.viric ];
forAllSupportedSystems = systems: f:
forTheseSystems = systems: f:
genAttrs (filter (x: elem x supportedSystems) systems) f;
/* Build a package on the given set of platforms. The function `f'
@ -66,14 +66,14 @@ rec {
platform as an argument . We return an attribute set containing
a derivation for each supported platform, i.e. { x86_64-linux =
f pkgs_x86_64_linux; i686-linux = f pkgs_i686_linux; ... }. */
testOn = systems: f: forAllSupportedSystems systems
testOn = systems: f: forTheseSystems systems
(system: hydraJob' (f (pkgsFor system)));
/* Similar to the testOn function, but with an additional
'crossSystem' parameter for allPackages, defining the target
platform for cross builds. */
testOnCross = crossSystem: systems: f: forAllSupportedSystems systems
testOnCross = crossSystem: systems: f: forTheseSystems systems
(system: hydraJob' (f (allPackages { inherit system crossSystem; })));

Loading…
Cancel
Save