public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

release-lib: forAllSupportedSystems -> forTheseSystems

Browse Source 
I'm going to move forAllSystems from nixos/release.nix, and these
functions sound too similar while doing different things.
This commit is contained in:
Tuomas Tynkkynen 2018-01-16 18:28:21 +02:00
parent 822c949833
commit 82cab72dd4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/release-cross.nix
View File

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

6
pkgs/top-level/release-lib.nix
View File

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