From a338959da6fb976345aac467e2c0d2f9b2c4ac46 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Dec 2015 20:41:50 -0600 Subject: [PATCH] melpaStablePackages: don't import all of pkgs --- .../editors/emacs-modes/melpa-stable-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-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 869c5549bfa6..bf8df730a777 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-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 74d3caabd6f1..e748f0b2fb02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11652,8 +11652,9 @@ let inherit fetchurl lib stdenv texinfo; }; - melpaStablePackages = - import ../applications/editors/emacs-modes/melpa-stable-packages.nix pkgs; + melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix { + inherit lib; + }; melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix { inherit lib;