b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages 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
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
'crossSystem' parameter for allPackages, defining the target
platform for cross builds. */
testOnCross = crossSystem: systems: f: {system ? builtins.currentSystem}:
if elem system systems
then f (allPackages { inherit system crossSystem; })
else {};
testOnCross = crossSystem: systems: f: genAttrs
(filter (x: elem x supportedSystems) systems)
(system: hydraJob' (f (allPackages { inherit system crossSystem; })));
/* Given a nested set where the leaf nodes are lists of platforms,