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

emacsPackagesNg: include elpaPackages

Browse Source
This commit is contained in:
Thomas Tuegel 2015-12-06 13:17:41 -06:00
parent 07a0031029
commit 026e3424a7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11603,7 +11603,7 @@ let
emacsPackagesNgGen = emacs: callPackage ./emacs-packages.nix { emacsPackagesNgGen = emacs: callPackage ./emacs-packages.nix {
overrides = (config.emacsPackageOverrides or (p: {})) pkgs; overrides = (config.emacsPackageOverrides or (p: {})) pkgs;
inherit emacs; inherit emacs elpaPackages;
trivialBuild = callPackage ../build-support/emacs/trivial.nix { trivialBuild = callPackage ../build-support/emacs/trivial.nix {
inherit emacs; inherit emacs;

10
pkgs/top-level/emacs-packages.nix
View File

@ -35,7 +35,7 @@
, lib, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg , lib, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg
, emacs , emacs, elpaPackages
, trivialBuild , trivialBuild
, melpaBuild , melpaBuild
@ -44,9 +44,7 @@
with lib.licenses; with lib.licenses;
let self = _self // overrides; let packagesFun = super: self: with self; {
callPackage = lib.callPackageWith (self // removeAttrs args ["overrides" "external"]);
_self = with self; {
inherit emacs; inherit emacs;
@ -2025,4 +2023,6 @@ let self = _self // overrides;
}; };
}; };
}; in self };
in elpaPackages.override packagesFun