emacsPackagesNg: include elpaPackages
This commit is contained in:
parent
07a0031029
commit
026e3424a7
|
@ -11603,7 +11603,7 @@ let
|
|||
emacsPackagesNgGen = emacs: callPackage ./emacs-packages.nix {
|
||||
overrides = (config.emacsPackageOverrides or (p: {})) pkgs;
|
||||
|
||||
inherit emacs;
|
||||
inherit emacs elpaPackages;
|
||||
|
||||
trivialBuild = callPackage ../build-support/emacs/trivial.nix {
|
||||
inherit emacs;
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
, lib, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg
|
||||
|
||||
, emacs
|
||||
, emacs, elpaPackages
|
||||
, trivialBuild
|
||||
, melpaBuild
|
||||
|
||||
|
@ -44,9 +44,7 @@
|
|||
|
||||
with lib.licenses;
|
||||
|
||||
let self = _self // overrides;
|
||||
callPackage = lib.callPackageWith (self // removeAttrs args ["overrides" "external"]);
|
||||
_self = with self; {
|
||||
let packagesFun = super: self: with self; {
|
||||
|
||||
inherit emacs;
|
||||
|
||||
|
@ -2025,4 +2023,6 @@ let self = _self // overrides;
|
|||
};
|
||||
};
|
||||
|
||||
}; in self
|
||||
};
|
||||
|
||||
in elpaPackages.override packagesFun
|
||||
|
|
Loading…
Reference in a new issue