From 82cab72dd41cf3e243a76bdbbe2ba9631e9ffa5a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 16 Jan 2018 18:28:21 +0200 Subject: release-lib: forAllSupportedSystems -> forTheseSystems I'm going to move forAllSystems from nixos/release.nix, and these functions sound too similar while doing different things. --- pkgs/top-level/release-cross.nix | 2 +- pkgs/top-level/release-lib.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index ce6fba9c40f3..f6b2ecfb5dbe 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.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; diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index fd05be0e1097..a56df53d27ef 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -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; }))); -- cgit 1.4.1