diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-16 12:45:57 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-17 07:23:50 -0600 |
| commit | f7ce3cdddb9ef7d5d5470005b2c4a481748800af (patch) | |
| tree | 114b6f17ac6896275aed1668b750233279c989bd /pkgs/top-level/emacs-packages.nix | |
| parent | 9f55d3f29f644b1a0f0aca62a06c1b48a813407c (diff) | |
| download | nixlib-f7ce3cdddb9ef7d5d5470005b2c4a481748800af.tar nixlib-f7ce3cdddb9ef7d5d5470005b2c4a481748800af.tar.gz nixlib-f7ce3cdddb9ef7d5d5470005b2c4a481748800af.tar.bz2 nixlib-f7ce3cdddb9ef7d5d5470005b2c4a481748800af.tar.lz nixlib-f7ce3cdddb9ef7d5d5470005b2c4a481748800af.tar.xz nixlib-f7ce3cdddb9ef7d5d5470005b2c4a481748800af.tar.zst nixlib-f7ce3cdddb9ef7d5d5470005b2c4a481748800af.zip | |
emacsPackagesNg: don't call `override` repeatedly
Calling override repeatedly obfuscates how the final package set is actually constructed.
Diffstat (limited to 'pkgs/top-level/emacs-packages.nix')
| -rw-r--r-- | pkgs/top-level/emacs-packages.nix | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index ebd6464de5a1..cb6da618768c 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -46,12 +46,7 @@ with lib.licenses; let - addMelpaPackages = scope: scope.override (super: melpaPackages); - addMelpaStablePackages = scope: scope.override (super: melpaStablePackages); - addElpaPackages = scope: scope.override (super: elpaPackages); - addOverrides = scope: scope.override packagesFun; - - packagesFun = super: self: with self; { + packagesFun = self: with self; { inherit emacs melpaBuild trivialBuild; @@ -2029,8 +2024,10 @@ let }; in - addOverrides - (addElpaPackages - (addMelpaStablePackages - (addMelpaPackages - (lib.makeScope newScope (self: { inherit emacs; }))))) + lib.makeScope newScope (self: + {} + // melpaPackages self + // melpaStablePackages self + // elpaPackages self + // packagesFun self + ) |