[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#31871] [PATCH 2/3] gnu: emacs-evil-ediff: Deprecate in favor of ema
From: |
Pierre Neidhardt |
Subject: |
[bug#31871] [PATCH 2/3] gnu: emacs-evil-ediff: Deprecate in favor of emacs-evil-collection. |
Date: |
Sun, 17 Jun 2018 11:09:40 +0200 |
* 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