diff options
author | adisbladis <adisbladis@gmail.com> | 2019-08-03 20:48:11 +0100 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2019-08-07 18:04:19 +0100 |
commit | 47d3b98b4b3f52e862fe62186ec5dcbb0a233202 (patch) | |
tree | 0296b97a6b51ea631c16c915c79792099fd6119d /pkgs/top-level/emacs-packages.nix | |
parent | 891122697121ac52a250bcfca891fd2bd4b19c70 (diff) |
melpa-packages: Add ability to ovveride melpa JSON archive location
This enables using the melpa json generator in an overlay
Diffstat (limited to 'pkgs/top-level/emacs-packages.nix')
-rw-r--r-- | pkgs/top-level/emacs-packages.nix | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index e1b9395444848..23e00708949fe 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -49,13 +49,18 @@ let inherit lib stdenv texinfo; }; - melpaStablePackages = import ../applications/editors/emacs-modes/melpa-stable-packages.nix { + # Contains both melpa stable & unstable + melpaGeneric = import ../applications/editors/emacs-modes/melpa-packages.nix { inherit external lib; }; - melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix { - inherit external lib; - }; + melpaStablePackages = self: let + m = melpaGeneric "stable" self; + in {melpaStablePackages = m;} // m; + + melpaPackages = self: let + m = melpaGeneric "unstable" self; + in {melpaPackages = m;} // m; orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { }; @@ -455,12 +460,11 @@ let }; -in - lib.makeScope newScope (self: - {} - // elpaPackages self - // melpaStablePackages self - // melpaPackages self - // orgPackages self - // packagesFun self - ) +in lib.makeScope newScope (self: + removeAttrs ({} + // elpaPackages self + // melpaStablePackages self + // melpaPackages self + // orgPackages self + // packagesFun self) [ "override" "overrideDerivation" ] +) |