From fab2ee8c10c2d39310c8e3cdddde9fd118727063 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 13 May 2020 08:30:39 +0200 Subject: [PATCH] maintainers/scripts/update.nix: derivation is the final station It does not make sense to look for derivations within derivations, not even when `recurseForDerivations` is true. Nix does not do that either: https://github.com/NixOS/nix/blob/ebc024df2287085d48ed6194aa756fd70c07f76c/src/libexpr/get-drvs.cc#L346-L355 --- maintainers/scripts/update.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 23ea11b66e1a..492000a10377 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -32,8 +32,8 @@ let (name: pkg: let result = builtins.tryEval ( - if lib.isDerivation pkg && cond name pkg - then [(return name pkg)] + if lib.isDerivation pkg + then lib.optional (cond name pkg) (return name pkg) else if pkg.recurseForDerivations or false || pkg.recurseForRelease or false then packagesWith cond return pkg else []