diff options
author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 14:50:27 +0000 |
---|---|---|
committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 14:50:27 +0000 |
commit | 0b67f7cb5dfc2b5080b8e3046917a0a15bb5140d (patch) | |
tree | 4f57caea64b3b7ac7d486fc69518165f4f047dce | |
parent | f7c86ee01841f85b94b3823f381119faf7060810 (diff) | |
download | nixlib-0b67f7cb5dfc2b5080b8e3046917a0a15bb5140d.tar nixlib-0b67f7cb5dfc2b5080b8e3046917a0a15bb5140d.tar.gz nixlib-0b67f7cb5dfc2b5080b8e3046917a0a15bb5140d.tar.bz2 nixlib-0b67f7cb5dfc2b5080b8e3046917a0a15bb5140d.tar.lz nixlib-0b67f7cb5dfc2b5080b8e3046917a0a15bb5140d.tar.xz nixlib-0b67f7cb5dfc2b5080b8e3046917a0a15bb5140d.tar.zst nixlib-0b67f7cb5dfc2b5080b8e3046917a0a15bb5140d.zip |
Move tweakAlias function into the aliases.nix file, and rename it.
-rw-r--r-- | pkgs/top-level/aliases.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 14 insertions, 7 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f2e1bbc5102c..944de7919293 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2,9 +2,21 @@ self: with self; +let + # Removind recurseForDerivation prevents derivations of aliased attribute + # set to appear while listing all the packages available. + removeRecurseForDerivations = _n: alias: with lib; + if alias.recurseForDerivations or false then + removeAttrs alias ["recurseForDerivations"] + else alias; + + doNotDisplayTwice = aliases: + lib.mapAttrs removeRecurseForDerivations aliases; +in + ### Deprecated aliases - for backward compatibility -rec { +doNotDisplayTwice rec { accounts-qt = qt5.accounts-qt; # added 2015-12-19 adobeReader = adobe-reader; aircrackng = aircrack-ng; # added 2016-01-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d120339110d..188c548050ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16474,13 +16474,8 @@ let aliases = import ./aliases.nix self; -tweakAlias = _n: alias: with lib; - if alias.recurseForDerivations or false then - removeAttrs alias ["recurseForDerivations"] - else alias; - in - lib.mapAttrs tweakAlias aliases // helperFunctions // stdenvDefault // self // overrides; + aliases // helperFunctions // stdenvDefault // self // overrides; in pkgs |