From 301f674632e49c39de522330823154424dc72cdc Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 29 Nov 2016 20:46:16 +0100 Subject: release: Don't build all packages for x86_64-linux Since NixOS/nixpkgs@8b782f4bd43be46e944a6bbac8569667f70478de, the packagePlatforms function now always returns a platform for x86_64-linux, but in vuizvui we want to *only* build packages we explicitly mark so. Signed-off-by: aszlig --- release.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'release.nix') diff --git a/release.nix b/release.nix index abb0135c..5591dcac 100644 --- a/release.nix +++ b/release.nix @@ -53,6 +53,17 @@ let inherit supportedSystems; packageSet = attrs: noGames (import vuizvui attrs).pkgs.vuizvui; }; + + packagePlatforms = mapAttrs (name: value: let + platforms = value.meta.hydraPlatforms or (value.meta.platforms or []); + isRecursive = value.recurseForDerivations or false + || value.recurseForRelease or false; + result = if isDerivation value then platforms + else if isRecursive then packagePlatforms value + else []; + tried = builtins.tryEval result; + in if tried.success then tried.value else []); + in with releaseLib; mapTestOn (packagePlatforms releaseLib.pkgs); in with pkgsUpstream.lib; with builtins; { -- cgit 1.4.1