ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

release-cross: Use the same genAttrs logic for testOnCross as testOn

Browse Source 
Eventually we'll want to test cross-compiling *from* various platforms. For
now, its good to be consistent.
This commit is contained in:
John Ericson 2016-12-25 10:17:03 -08:00
parent 74753d01f8
commit db0dbd0b81
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
with import ./release-lib.nix { supportedSystems = []; }; with import ./release-lib.nix { supportedSystems = [ builtins.currentSystem ]; };
let let
nativePlatforms = linux; nativePlatforms = linux;

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

@ -59,10 +59,9 @@ rec {
/* 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: {system ? builtins.currentSystem}: testOnCross = crossSystem: systems: f: genAttrs
if elem system systems (filter (x: elem x supportedSystems) systems)
then f (allPackages { inherit system crossSystem; }) (system: hydraJob' (f (allPackages { inherit system crossSystem; })));
else {};
/* Given a nested set where the leaf nodes are lists of platforms, /* Given a nested set where the leaf nodes are lists of platforms,