diff options
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 e1b93954448..23e00708949 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" ] +) |