From a4f4d1717d377d8d3698ed0e306e18c8278bd2a7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Dec 2015 20:39:45 -0600 Subject: [PATCH] elpaPackages: don't import all of pkgs --- pkgs/applications/editors/emacs-modes/elpa-packages.nix | 8 +++----- pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix index 0f92ded4043..7b8d429f76a 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -1,8 +1,8 @@ -pkgs: with pkgs; +{ fetchurl, lib, stdenv, texinfo }: let - inherit (stdenv.lib) makeScope mapAttrs; + inherit (lib) makeScope mapAttrs; json = builtins.readFile ./elpa-packages.json; manifest = builtins.fromJSON json; @@ -40,12 +40,10 @@ self: super = mapAttrs (mkPackage self) manifest; elpaBuild = import ../../../build-support/emacs/melpa.nix { - inherit (pkgs) lib stdenv fetchurl texinfo; + inherit fetchurl lib stdenv texinfo; inherit (self) emacs; }; - builtin = null; - markBroken = pkg: pkg.override { elpaBuild = args: self.elpaBuild (args // { meta = (args.meta or {}) // { broken = true; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d12a05f83bc..feb55346c0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11648,8 +11648,9 @@ let emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24); - elpaPackages = - import ../applications/editors/emacs-modes/elpa-packages.nix pkgs; + elpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix { + inherit fetchurl lib stdenv texinfo; + }; melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix pkgs;