nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Under pkgsFun, expand self attribute, and rename self_ to self.

Browse Source 
Note, the aliases are now computed against the set of packages defined in
the set of all packages, and no longer apply to any overriden package.

I think this is better as this reduces the amount of surprizes.
This commit is contained in:
Nicolas B. Pierron 2016-03-19 14:39:48 +00:00
parent ffcb6682bc
commit 8d355b8d85
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,6 @@ let
pkgsFun = pkgs: overrides:
let
defaultScope = pkgs // pkgs.xorg;
self = helperFunctions // self_ // overrides;
# Helper functions that are exported through `pkgs'.
helperFunctions =
@ -131,7 +130,7 @@ let
stdenvAdapters =
import ../stdenv/adapters.nix pkgs;
self_ = with self; {
self = with helperFunctions; with self; with overrides; {
# Make some arguments passed to all-packages.nix available
inherit system platform;
@ -16468,7 +16467,7 @@ let
mg = callPackage ../applications/editors/mg { };
}; # self_ =
}; # self =
aliases = import ./aliases.nix self;
@ -16479,7 +16478,7 @@ tweakAlias = _n: alias: with lib;
else alias;
in
lib.mapAttrs tweakAlias aliases // self;
lib.mapAttrs tweakAlias aliases // helperFunctions // self // overrides;
in
pkgs