From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52364) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUThF-0004Eu-Gx for guix-patches@gnu.org; Sun, 17 Jun 2018 05:10:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUThC-0003XQ-A7 for guix-patches@gnu.org; Sun, 17 Jun 2018 05:10:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:44659) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fUThC-0003XM-6O for guix-patches@gnu.org; Sun, 17 Jun 2018 05:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fUThC-0007RJ-06 for guix-patches@gnu.org; Sun, 17 Jun 2018 05:10:02 -0400 Subject: [bug#31871] [PATCH 2/3] gnu: emacs-evil-ediff: Deprecate in favor of emacs-evil-collection. References: <20180617090800.28397-1-ambrevar@gmail.com> In-Reply-To: <20180617090800.28397-1-ambrevar@gmail.com> Resent-Message-ID: From: Pierre Neidhardt Date: Sun, 17 Jun 2018 11:09:40 +0200 Message-Id: <20180617090941.29130-1-ambrevar@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 31871@debbugs.gnu.org * gnu/packages/emacs.scm (emacs-evil-ediff): Deprecate. --- gnu/packages/emacs.scm | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e7c3bd634..c35629e43 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -10702,27 +10702,8 @@ Org-mode file, and citations of Zotero items in Pandoc Markdown files.") (license license:gpl3+))) (define-public emacs-evil-ediff - (package - (name "emacs-evil-ediff") - (version "20170724") - (source - (origin - (method url-fetch) - (uri (string-append - "https://github.com/emacs-evil/evil-ediff/archive/" - "67b0e69f65c196eff5b39dacb7a9ec05bb919c74" - ".tar.gz")) - (sha256 - (base32 - "0j2x26zfc6md54mjf76qpybil4yal70lp5bifcz62l1f8fc1vvlq")))) - (build-system emacs-build-system) - (propagated-inputs `(("emacs-evil" ,emacs-evil))) - (home-page "https://github.com/emacs-evil/evil-ediff") - (synopsis "Make Ediff a little evil") - (description - "This Emacs package configures Ediff to be friendlier to users of Vi-like -keybindings. Consult the help buffer for more information.") - (license license:gpl3+))) + ;; Evil-Ediff is included in Evil Collection from 20180617. + (deprecated-package "emacs-evil-ediff" emacs-evil-collection)) (define-public emacs-evil-magit (let ((commit "dbf5a646a7ce1c35c229dfdc423bd5ecd927a3a8")) -- 2.17.1