about summary refs log tree commit diff
path: root/pkgs/top-level/emacs-packages.nix
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2015-12-15 11:57:51 -0600
committerThomas Tuegel <ttuegel@gmail.com>2015-12-17 07:23:50 -0600
commit8e655250bdde40150f0c8c059f6d8f5483805dec (patch)
tree49f3a80c0b14986aa32c72a28a39ddd009b08c49 /pkgs/top-level/emacs-packages.nix
parent4e99a11653fc91fd5adf7d2738ac4fd1e4eef810 (diff)
downloadnixlib-8e655250bdde40150f0c8c059f6d8f5483805dec.tar
nixlib-8e655250bdde40150f0c8c059f6d8f5483805dec.tar.gz
nixlib-8e655250bdde40150f0c8c059f6d8f5483805dec.tar.bz2
nixlib-8e655250bdde40150f0c8c059f6d8f5483805dec.tar.lz
nixlib-8e655250bdde40150f0c8c059f6d8f5483805dec.tar.xz
nixlib-8e655250bdde40150f0c8c059f6d8f5483805dec.tar.zst
nixlib-8e655250bdde40150f0c8c059f6d8f5483805dec.zip
emacsPackagesNg: add all of MELPA
Diffstat (limited to 'pkgs/top-level/emacs-packages.nix')
-rw-r--r--pkgs/top-level/emacs-packages.nix22
1 files changed, 17 insertions, 5 deletions
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 2acb4cbbe0be..ebd6464de5a1 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -33,9 +33,9 @@
 
 { overrides
 
-, lib, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg
+, lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg
 
-, emacs, elpaPackages
+, emacs, elpaPackages, melpaPackages, melpaStablePackages
 , trivialBuild
 , melpaBuild
 
@@ -44,7 +44,14 @@
 
 with lib.licenses;
 
-let packagesFun = super: self: with self; {
+let
+
+  addMelpaPackages = scope: scope.override (super: melpaPackages);
+  addMelpaStablePackages = scope: scope.override (super: melpaStablePackages);
+  addElpaPackages = scope: scope.override (super: elpaPackages);
+  addOverrides = scope: scope.override packagesFun;
+
+  packagesFun = super: self: with self; {
 
   inherit emacs melpaBuild trivialBuild;
 
@@ -2019,6 +2026,11 @@ let packagesFun = super: self: with self; {
     };
   };
 
-};
+  };
 
-in elpaPackages.override packagesFun
+in
+  addOverrides
+  (addElpaPackages
+  (addMelpaStablePackages
+  (addMelpaPackages
+  (lib.makeScope newScope (self: { inherit emacs; })))))