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

aliases: fix using the wrong self refs

Browse Source
This commit is contained in:
Will Fancher 2018-06-10 17:20:02 -04:00 committed by Orivej Desh
parent 4ca4c886e4
commit 9555fd700d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/aliases.nix
View File

@ -1,4 +1,4 @@
self: lib: self: super:
with self; with self;
@ -19,7 +19,7 @@ let
# Make sure that we are not shadowing something from # Make sure that we are not shadowing something from
# all-packages.nix. # all-packages.nix.
checkInPkgs = n: alias: if builtins.hasAttr n self checkInPkgs = n: alias: if builtins.hasAttr n super
then throw "Alias ${n} is still in all-packages.nix" then throw "Alias ${n} is still in all-packages.nix"
else alias; else alias;
@ -32,7 +32,7 @@ in
### Deprecated aliases - for backward compatibility ### Deprecated aliases - for backward compatibility
mapAliases (rec { mapAliases ({
PPSSPP = ppsspp; # added 2017-10-01 PPSSPP = ppsspp; # added 2017-10-01
QmidiNet = qmidinet; # added 2016-05-22 QmidiNet = qmidinet; # added 2016-05-22
accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19 accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19

2
pkgs/top-level/stage.nix
View File

@ -98,7 +98,7 @@ let
in res; in res;
aliases = self: super: if config.skipAliases or false then {} aliases = self: super: if config.skipAliases or false then {}
else import ./aliases.nix super; else import ./aliases.nix lib self super;
# stdenvOverrides is used to avoid having multiple of versions # stdenvOverrides is used to avoid having multiple of versions
# of certain dependencies that were used in bootstrapping the # of certain dependencies that were used in bootstrapping the