diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-05-13 08:30:39 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-05-13 11:06:33 +0200 |
| commit | fab2ee8c10c2d39310c8e3cdddde9fd118727063 (patch) | |
| tree | 3487a7fe7455b961997de072e206c5a3cf394238 /maintainers/scripts | |
| parent | 8f50956ee059d882be5ed53ad9704ebcaa41856d (diff) | |
| download | nixpkgs-fab2ee8c10c2d39310c8e3cdddde9fd118727063.tar nixpkgs-fab2ee8c10c2d39310c8e3cdddde9fd118727063.tar.gz nixpkgs-fab2ee8c10c2d39310c8e3cdddde9fd118727063.tar.bz2 nixpkgs-fab2ee8c10c2d39310c8e3cdddde9fd118727063.tar.lz nixpkgs-fab2ee8c10c2d39310c8e3cdddde9fd118727063.tar.xz nixpkgs-fab2ee8c10c2d39310c8e3cdddde9fd118727063.tar.zst nixpkgs-fab2ee8c10c2d39310c8e3cdddde9fd118727063.zip | |
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
Diffstat (limited to 'maintainers/scripts')
| -rwxr-xr-x | maintainers/scripts/update.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 23ea11b66e1..492000a1037 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 [] |