diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-12-16 10:14:59 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-12-16 10:14:59 +0100 |
| commit | c485a932d9941c43ab603442da0db18a6929cca1 (patch) | |
| tree | fb91ba190115cf916335a3468734d5f98809dd5f /maintainers/scripts/update.nix | |
| parent | f79dfa8151b5a03e25926359d59c434b3f2f2c0c (diff) | |
maintainers/scripts/update.nix: Do not traverse lists
Lists items are not directly accessible like attributes in attrsets are. This makes it hard to represent their address in `UPDATE_NIX_ATTR_PATH` environment variable passed to update scripts. Given that I only introduced list support for `gnome3` attribute set and we stopped using them there, let’s remove the list support again. NixOS modules are better place for package collections anyway. This was meant to go in with https://github.com/NixOS/nixpkgs/pull/98304 but got accidentally omitted somehow.
Diffstat (limited to 'maintainers/scripts/update.nix')
| -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 5bacf9dda6a8b..1305e0947c726 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 |