diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-06 13:17:41 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-06 13:17:41 -0600 |
commit | 026e3424a7d2fb0f0bd08016aaeeb91ba1020ced (patch) | |
tree | dbe911354af98e049e039878c7e9be7180f9fca6 /pkgs/top-level/emacs-packages.nix | |
parent | 07a003102948d5af2d8781bf4fe85d306d2ab448 (diff) | |
download | nixlib-026e3424a7d2fb0f0bd08016aaeeb91ba1020ced.tar nixlib-026e3424a7d2fb0f0bd08016aaeeb91ba1020ced.tar.gz nixlib-026e3424a7d2fb0f0bd08016aaeeb91ba1020ced.tar.bz2 nixlib-026e3424a7d2fb0f0bd08016aaeeb91ba1020ced.tar.lz nixlib-026e3424a7d2fb0f0bd08016aaeeb91ba1020ced.tar.xz nixlib-026e3424a7d2fb0f0bd08016aaeeb91ba1020ced.tar.zst nixlib-026e3424a7d2fb0f0bd08016aaeeb91ba1020ced.zip |
emacsPackagesNg: include elpaPackages
Diffstat (limited to 'pkgs/top-level/emacs-packages.nix')
-rw-r--r-- | pkgs/top-level/emacs-packages.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index d457efce4d4b..26be7d1cda56 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -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 |