From 28af093438a7f9d7d836bc5fe41cca8a2ed92ced Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 16 Dec 2015 20:41:08 -0600
Subject: [PATCH] melpaPackages: don't import all of pkgs

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 4 ++--
 pkgs/top-level/all-packages.nix                          | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 1bc4363cb11..e48baa2d6e0 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -1,8 +1,8 @@
-pkgs: with pkgs;
+{ lib }:
 
 let
 
-  inherit (stdenv.lib) makeScope mapAttrs;
+  inherit (lib) makeScope mapAttrs;
 
   json = builtins.readFile ./melpa-stable-packages.json;
   manifest = builtins.fromJSON json;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index feb55346c0f..74d3caabd6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11655,8 +11655,9 @@ let
   melpaStablePackages =
     import ../applications/editors/emacs-modes/melpa-stable-packages.nix pkgs;
 
-  melpaPackages =
-    import ../applications/editors/emacs-modes/melpa-packages.nix pkgs;
+  melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix {
+    inherit lib;
+  };
 
   emacsWithPackages = callPackage ../build-support/emacs/wrapper.nix { };
   emacs24WithPackages = emacsWithPackages.override { emacs = emacs24; };