public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

all-packages: don't recurse into aliased sets

Browse Source 
So far nix-env -qP would prefer e.g. `xlibs.*` to `xorg.*`,
so we just disallow recursing into aliased sets
while keeping them available for explicit usage.

Consequently, `xlibs` references should get killed on the next
regeneration.
This commit is contained in:
Vladimír Čunát 2015-09-23 11:51:08 +02:00
parent 5f3990185f
commit c10f7050c5
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/top-level/all-packages.nix
View File

@ -15035,8 +15035,12 @@ let
mg = callPackage ../applications/editors/mg { }; mg = callPackage ../applications/editors/mg { };
}; # self_ =
# Attributes for backward compatibility.
### Deprecated aliases - for backward compatibility
aliases = with self; rec {
adobeReader = adobe-reader; adobeReader = adobe-reader;
arduino_core = arduino-core; # added 2015-02-04 arduino_core = arduino-core; # added 2015-02-04
asciidocFull = asciidoc-full; # added 2014-06-22 asciidocFull = asciidoc-full; # added 2014-06-22
@ -15069,5 +15073,12 @@ let
xlibs = xorg; # added 2015-09 xlibs = xorg; # added 2015-09
youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
youtubeDL = youtube-dl; # added 2014-10-26 youtubeDL = youtube-dl; # added 2014-10-26
};
tweakAlias = _n: alias: with lib;
if !isDerivation alias && isAttrs alias then
removeAttrs alias ["recurseForDerivations"]
else alias;
in lib.mapAttrs tweakAlias aliases // self; in pkgs
}; in self; in pkgs