public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emacsPackagesNgGen: use import, not callPackage

Browse Source 
`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`.
This commit is contained in:
Thomas Tuegel 2015-12-16 06:55:03 -06:00
parent 59f497bc4d
commit e21f5f933c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/top-level/all-packages.nix
View File

@ -11624,10 +11624,11 @@ let
emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages); emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages);
emacsPackagesNgGen = emacs: callPackage ./emacs-packages.nix { emacsPackagesNgGen = emacs: import ./emacs-packages.nix {
overrides = (config.emacsPackageOverrides or (p: {})) pkgs; overrides = (config.emacsPackageOverrides or (p: {})) pkgs;
inherit newScope; inherit lib newScope stdenv;
inherit fetchFromGitHub fetchgit fetchhg fetchurl;
inherit emacs elpaPackages melpaPackages melpaStablePackages; inherit emacs elpaPackages melpaPackages melpaStablePackages;
trivialBuild = callPackage ../build-support/emacs/trivial.nix { trivialBuild = callPackage ../build-support/emacs/trivial.nix {