From e21f5f933c7e61f4b3a6687cd9e6062ce19430cd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 16 Dec 2015 06:55:03 -0600 Subject: [PATCH] emacsPackagesNgGen: use import, not callPackage `callPackage` should only be used for actual packages. Functions, like `emacsPackagesNgGen`, should be `import`ed. This also has the effect of exposing the `override` function provided by `makeScope` so that `emacsPackagesNg.override` overrides the package set instead of overriding the arguments to `emacsPackagesNgGen`. --- pkgs/top-level/all-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 012b7225831..d12a05f83bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11624,10 +11624,11 @@ let emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages); - emacsPackagesNgGen = emacs: callPackage ./emacs-packages.nix { + emacsPackagesNgGen = emacs: import ./emacs-packages.nix { overrides = (config.emacsPackageOverrides or (p: {})) pkgs; - inherit newScope; + inherit lib newScope stdenv; + inherit fetchFromGitHub fetchgit fetchhg fetchurl; inherit emacs elpaPackages melpaPackages melpaStablePackages; trivialBuild = callPackage ../build-support/emacs/trivial.nix {