From a62ee8d45cd6d62ac5a985a386a4280a7c4059a6 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 15 Jan 2017 14:06:35 -0500 Subject: [PATCH] release-cross: Expose sub-jobs of linux cross stdenv --- pkgs/top-level/release-cross.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index ec013816145c..f582bcf3b323 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -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; }