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

emacsPackagesNg: don't call override repeatedly

Browse Source 
Calling override repeatedly obfuscates how the final package set is
actually constructed.
This commit is contained in:
Thomas Tuegel 2015-12-16 12:45:57 -06:00
parent 9f55d3f29f
commit f7ce3cdddb
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/top-level/emacs-packages.nix
View File

@ -46,12 +46,7 @@ with lib.licenses;
let let
addMelpaPackages = scope: scope.override (super: melpaPackages); packagesFun = self: with self; {
addMelpaStablePackages = scope: scope.override (super: melpaStablePackages);
addElpaPackages = scope: scope.override (super: elpaPackages);
addOverrides = scope: scope.override packagesFun;
packagesFun = super: self: with self; {
inherit emacs melpaBuild trivialBuild; inherit emacs melpaBuild trivialBuild;
@ -2029,8 +2024,10 @@ let
}; };
in in
addOverrides lib.makeScope newScope (self:
(addElpaPackages {}
(addMelpaStablePackages // melpaPackages self
(addMelpaPackages // melpaStablePackages self
(lib.makeScope newScope (self: { inherit emacs; }))))) // elpaPackages self
// packagesFun self
)