From 3c4d5457a8f5579a621f7599deee99a66089256b Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Tue, 3 Aug 2010 14:02:42 +0000 Subject: [PATCH] Add recurseForRelease flag I don't want kde-4.5 to be visible for nix-env, but I want hydra to build it svn path=/nixpkgs/trunk/; revision=22930 --- pkgs/desktops/kde-4.5/default.nix | 1 + pkgs/top-level/release-lib.nix | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 23bb40dd3cf..3b991cb2ef7 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -1,6 +1,7 @@ callPackage : { + recurseForRelease = true; ### SUPPORT akonadi = callPackage ./support/akonadi { }; diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix index ffee50b4e49..a470098529f 100644 --- a/pkgs/top-level/release-lib.nix +++ b/pkgs/top-level/release-lib.nix @@ -104,7 +104,9 @@ rec { # May fail as much as it wishes, we will catch the error. processPackage = attrSet: - if attrSet ? recurseForDerivations && attrSet.recurseForDerivations then + if attrSet ? recurseForDerivations && attrSet.recurseForDerivations then + packagesWithMetaPlatform attrSet + else if attrSet ? recurseForRelease && attrSet.recurseForRelease then packagesWithMetaPlatform attrSet else if attrSet ? meta && attrSet.meta ? platforms