From b863b5fc3595d4de69ffdf1732416b625286a72c Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Mon, 28 Dec 2015 20:28:48 +0100
Subject: [PATCH 1/2] Remove yasnippet's manual derivation

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index fe57a2f122a3..3a75f2a9fd11 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1984,29 +1984,6 @@ let
     };
   };
 
-  yasnippet = melpaBuild rec {
-    pname = "yasnippet";
-    version = "0.8.1";
-    src = fetchFromGitHub {
-      owner  = "capitaomorte";
-      repo   = pname;
-      rev    = "01139a2deb9eda272b9b771fbbe15d096061efa4";
-      sha256 = "1b0bxzkmw7yd1yf6326zf52aq63n283vy57pysj8cc34d9bk6nnk";
-    };
-    meta = {
-      description = "A template system for Emacs";
-      longDescription = ''
-        YASnippet is a template system for Emacs.
-        It allows you to type an abbreviation and automatically expand it into
-        function templates. Bundled language templates include: C, C++, C#,
-        Perl, Python, Ruby, SQL, LaTeX, HTML, CSS and more.
-        The snippet syntax is inspired from TextMate's syntax, you can even import
-        most TextMate templates to YASnippet.
-      '';
-      license = gpl2Plus;
-    };
-  };
-
   zenburn-theme = melpaBuild rec {
     pname   = "zenburn-theme";
     version = "2.2";

From fddf0dfa49676812f8867c336d465cda8017fcfe Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Mon, 28 Dec 2015 20:29:54 +0100
Subject: [PATCH 2/2] Remove deferred's manual derivation

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 3a75f2a9fd11..17610ddb232b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -473,28 +473,6 @@ let
     };
   };
 
-  deferred = melpaBuild rec {
-    version = "0.3.2";
-    pname = "deferred";
-
-    src = fetchFromGitHub {
-      owner = "kiwanami";
-      repo = "emacs-${pname}";
-      rev = "896d4b53210289afe489e1ee7db4e12cb9248109";
-      sha256 = "0ysahdyvlg240dynwn23kk2d9kb432zh2skr1gydm3rxwn6f18r0";
-    };
-
-    meta = {
-      description = "Simple asynchronous functions for emacs-lisp";
-      longDescription = ''
-        deferred.el provides facilities to manage asynchronous tasks.
-        The API and implementations were translated from JSDeferred (by cho45)
-         and Mochikit.Async (by Bob Ippolito) in JavaScript.
-      '';
-      license = gpl3Plus;
-    };
-  };
-
   diminish = melpaBuild rec {
     pname   = "diminish";
     version = "0.44";