diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-12-16 14:35:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 14:35:15 +0100 |
| commit | 31ded1888efaa2f8549a3652c8bc4341a2731a46 (patch) | |
| tree | c637201f42b29fd88dcf96c23a9ddbcd2b3bfb2f | |
| parent | 00941cd747e9bc1c3326d1362dbc7e9cfe18cf53 (diff) | |
| parent | c485a932d9941c43ab603442da0db18a6929cca1 (diff) | |
Merge pull request #107014 from jtojnar/update-script-no-lists
maintainers/scripts/update.nix: Do not traverse lists
| -rwxr-xr-x | maintainers/scripts/update.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 5bacf9dda6a8..1305e0947c72 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -34,7 +34,7 @@ let /* Recursively find all packages (derivations) in `pkgs` matching `cond` predicate. - Type: packagesWithPath :: AttrPath → (AttrPath → derivation → bool) → (AttrSet | List) → List<AttrSet{attrPath :: str; package :: derivation; }> + Type: packagesWithPath :: AttrPath → (AttrPath → derivation → bool) → AttrSet → List<AttrSet{attrPath :: str; package :: derivation; }> AttrPath :: [str] The packages will be returned as a list of named pairs comprising of: @@ -60,8 +60,6 @@ let if path == rootPath || evaluatedPathContent.recurseForDerivations or false || evaluatedPathContent.recurseForRelease or false then dedupResults (lib.mapAttrsToList (name: elem: packagesWithPathInner (path ++ [name]) elem) evaluatedPathContent) else [] - else if lib.isList evaluatedPathContent then - dedupResults (lib.imap0 (i: elem: packagesWithPathInner (path ++ [i]) elem) evaluatedPathContent) else [] else []; in |