Merge branch 'emacs-packages'

pkgs/applications/editors/emacs-modes/elpa-packages.nix

@@ -35,7 +35,7 @@ let
             pname = name;
             inherit (recipe) version;
             inherit src;
-            deps =
+            packageRequires =
               let lookupDep = d: self."${d}" or null;
               in map lookupDep recipe.deps;
             meta = {

pkgs/applications/editors/emacs-modes/melpa-packages.nix

@@ -40,7 +40,7 @@ let
             pname = name;
             inherit (recipe) version;
             inherit src;
-            deps =
+            packageRequires =
               let lookupDep = d: self."${d}" or null;
               in map lookupDep recipe.deps;
             meta = {
@@ -62,5 +62,10 @@ self:
         meta = (args.meta or {}) // { broken = true; };
       });
     };
+
+    melpaPackages = super // {
+      # broken upstream
+      ack-menu = markBroken super.ack-menu;
+    };
   in
-    super // { melpaPackages = super; }
+    melpaPackages // { inherit melpaPackages; }

pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix

@@ -42,7 +42,7 @@ let
             pname = name;
             inherit (recipe) version;
             inherit src;
-            deps =
+            packageRequires =
               let lookupDep = d: self."${d}" or null;
               in map lookupDep recipe.deps;
             meta = {
@@ -64,5 +64,10 @@ self:
         meta = (args.meta or {}) // { broken = true; };
       });
     };
+
+    melpaStablePackages = super // {
+      # broken upstream
+      ack-menu = markBroken super.ack-menu;
+    };
   in
-    super // { melpaStablePackages = super; }
+    melpaStablePackages // { inherit melpaStablePackages; }

pkgs/top-level/emacs-packages.nix

@@ -84,21 +84,6 @@ let
     };
   };
 
-  ace-jump-mode = melpaBuild rec {
-    pname   = "ace-jump-mode";
-    version = "20140616";
-    src = fetchFromGitHub {
-      owner  = "winterTTr";
-      repo   = pname;
-      rev    = "8351e2df4fbbeb2a4003f2fb39f46d33803f3dac";
-      sha256 = "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6";
-    };
-    meta = {
-      description = "Advanced cursor movements mode for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
   tablist = melpaBuild rec {
     pname = "tablist";
     inherit (pdf-tools) src version;