Merge pull request #21911 from Ericson2314/release-cross

release-cross: Expose sub-jobs of linux cross stdenv
This commit is contained in:
John Ericson 2017-01-15 14:21:04 -05:00 committed by GitHub
commit cef5131ea7

View File

@ -8,7 +8,7 @@
with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
let
lib = import ../../lib;
inherit (pkgs) lib;
nativePlatforms = linux;
@ -192,7 +192,7 @@ in
/* Cross-built bootstrap tools for every supported platform */
bootstrapTools = let
tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; };
maintainers = [ pkgs.lib.maintainers.dezgeg ];
mkBootstrapToolsJob = bt: hydraJob' (pkgs.lib.addMetaAttrs { inherit maintainers; } bt.dist);
in pkgs.lib.mapAttrs (name: mkBootstrapToolsJob) tools;
maintainers = [ lib.maintainers.dezgeg ];
mkBootstrapToolsJob = drv: hydraJob' (lib.addMetaAttrs { inherit maintainers; } drv);
in lib.mapAttrsRecursiveCond (as: !lib.isDerivation as) (name: mkBootstrapToolsJob) tools;
}