diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2016-12-25 10:17:03 -0800 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2016-12-27 15:41:07 -0800 |
| commit | db0dbd0b81cdcb879186645a3eec47a9882f2366 (patch) | |
| tree | a046dcb40c3c2e2489de221a6d46b4aac97cefe4 /pkgs/top-level | |
| parent | 74753d01f8249ab1119314fa3d8ac60ccf6e601e (diff) | |
release-cross: Use the same genAttrs logic for `testOnCross` as `testOn`
Eventually we'll want to test cross-compiling *from* various platforms. For now, its good to be consistent.
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/release-cross.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/release-lib.nix | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 9b6d509eae995..cbafc65195dbe 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -1,4 +1,4 @@ -with import ./release-lib.nix { supportedSystems = []; }; +with import ./release-lib.nix { supportedSystems = [ builtins.currentSystem ]; }; let nativePlatforms = linux; diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index 5f6dd49d6ecc0..fba8429c9c70a 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -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, |