diff options
| author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-24 20:54:20 +0100 |
|---|---|---|
| committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-24 20:54:20 +0100 |
| commit | 5d6a4a6fa9bc340e5e2daefd6b82cdd5b9f011e9 (patch) | |
| tree | ce39fb6991c49a2d464fb77eeb105777220b1c81 /pkgs/top-level/aliases.nix | |
| parent | 99c4f143d90493ca8c79a28482488b7ab53046e9 (diff) | |
| parent | 87ad35e336bcaefc0254c01d76c5e2356c315e43 (diff) | |
| download | nixlib-5d6a4a6fa9bc340e5e2daefd6b82cdd5b9f011e9.tar nixlib-5d6a4a6fa9bc340e5e2daefd6b82cdd5b9f011e9.tar.gz nixlib-5d6a4a6fa9bc340e5e2daefd6b82cdd5b9f011e9.tar.bz2 nixlib-5d6a4a6fa9bc340e5e2daefd6b82cdd5b9f011e9.tar.lz nixlib-5d6a4a6fa9bc340e5e2daefd6b82cdd5b9f011e9.tar.xz nixlib-5d6a4a6fa9bc340e5e2daefd6b82cdd5b9f011e9.tar.zst nixlib-5d6a4a6fa9bc340e5e2daefd6b82cdd5b9f011e9.zip | |
Merge pull request #14000 from nbp/fix-extend
Use fix and extends functions for all-packages.nix
Diffstat (limited to 'pkgs/top-level/aliases.nix')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index e17bfec29584..9d278b19342c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2,9 +2,21 @@ self: with self; +let + # Removing 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 @@ -50,7 +62,6 @@ rec { mssys = ms-sys; # added 2015-12-13 multipath_tools = multipath-tools; # added 2016-01-21 mupen64plus1_5 = mupen64plus; # added 2016-02-12 - ncat = nmap; # added 2016-01-26 nfsUtils = nfs-utils; # added 2014-12-06 phonon_qt5 = qt5.phonon; # added 2015-12-19 phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer; # added 2015-12-19 |