From f7ce3cdddb9ef7d5d5470005b2c4a481748800af Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 16 Dec 2015 12:45:57 -0600
Subject: [PATCH] emacsPackagesNg: don't call `override` repeatedly

Calling override repeatedly obfuscates how the final package set is
actually constructed.
---
 pkgs/top-level/emacs-packages.nix | 19 ++++++++-----------
 1 file 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
+  )