From 57c9994a08831d45f93970c357f12b240f8b1115 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 22 Dec 2015 06:46:15 -0600
Subject: [PATCH 1/5] ace-jump-mode: 20140616 -> 2.0

---
 pkgs/top-level/emacs-packages.nix | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 6728280c3bc..fe57a2f122a 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/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;

From b3949f29cd6a69bb14929fd657ed9600d5f325d6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 22 Dec 2015 06:50:21 -0600
Subject: [PATCH 2/5] emacsPackagesNg.ack-menu: broken upstream

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix   | 7 ++++++-
 .../editors/emacs-modes/melpa-stable-packages.nix          | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 43d48d0d298..2d66423eb2d 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -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; }
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index aa940016b5e..a65f1b0dc28 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -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; }

From 26a7470ce6c1b5cc34047678870c7c007f113777 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 22 Dec 2015 06:55:10 -0600
Subject: [PATCH 3/5] elpa-packages: fix dependency specification

---
 pkgs/applications/editors/emacs-modes/elpa-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index 479835dd8b0..aa30d62c60a 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/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 = {

From f35c3d03d658f2d948e26cbbdeb138beba2c826e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 22 Dec 2015 06:55:25 -0600
Subject: [PATCH 4/5] melpa-packages: fix dependency specification

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 2d66423eb2d..d7e894c672a 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/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 = {

From a9ca11e82a0e70f834db9891c95de1b3f7c57408 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 22 Dec 2015 06:55:34 -0600
Subject: [PATCH 5/5] melpa-stable-packages: fix dependency specification

---
 pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index a65f1b0dc28..7572c722e33 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/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 = {