Subject: [bug#64755] [PATCH] gnu: git-modes -> emacs-git-modes.

From: Ahmad Draidi <[email-masked]>
Date: Fri, 21 Jul 2023 00:49:18 +0400

* gnu/packages/emacs-xyz.scm (emacs-git-modes): New variable.
(git-modes): Deprecate variable.
---

This makes the package name consistent when installing it through 'guix package -i' and a variable name in a system declaration file (e.g. /etc/config.scm). It finishes the job in #29582.

Not sure if the deprecation method I used is optimal, since it brings back to life the package name 'git-modes'. However, putting 'emacs-git-modes' in 'old-name' causes 'warning: ambiguous package specification', as expected.

 gnu/packages/emacs-xyz.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 550e5d2a65..6e8b2b313c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1261,7 +1261,7 @@ (define-public emacs-project
 some utility functions, and commands using that infrastructure.")
     (license license:gpl3+)))
 
-(define-public git-modes
+(define-public emacs-git-modes
   (package
     (name "emacs-git-modes")
     (version "1.4.1")
@@ -1285,6 +1285,9 @@ (define-public git-modes
 @file{.git/config}.")
     (license license:gpl3+)))
 
+(define-public git-modes
+  (deprecated-package "git-modes" emacs-git-modes))
+
 (define-public emacs-with-editor
   (package
     (name "emacs-with-editor")

base-commit: 21b718f4d6c3ded8ef50d12f6e9ae6474f74620f
-- 
2.41.0