Subject: [bug#76377] gnu: packages: remove g-golf and nomad

From: "pelzflorian (Florian Pelz)" <[email-masked]>
Date: Thu, 27 Feb 2025 09:20:20 +0100

Note that we are mostly discussing dependency lists when writing a
package

(inputs
 (list adwaita-icon-theme
       bash-minimal
       libadwaita
       (librsvg-for-system)
       gtk
       guile-3.0
       guile-g-golf))

and the style of Guix source code.  On the CLI,

guix shell --no-grafts g-golf gtk guile

is possible at this time without warning or discouragement, although on
equal terms with

guix shell --no-grafts guile-g-golf gtk guile

"Leo Famulari" <[email-masked]> writes:
> And really, what's so bad about naming the package of the g-golf
> program "g-golf"? We've deviated from these informal guidelines before
> and the world kept turning.

gtk is named gtk, not libgtk, although gtk does have binaries, too.

GTK 3 library clutter is named clutter, not libclutter, so you have a
point there.

Is Leo right, that we deviate frequently and with precedent?  If so, my
standing in for the policy crumbles.  Better change the name now than
later.

Other opinions?

Preliminary diff attached.  This reverts:

commit 694e31723788d811d026a047c9dea8e0d735362c
Author: Zhu Zihao <[email-masked]>
Date:   Thu Feb 3 22:35:10 2022 +0800

    gnu: Deprecate the 'g-golf' variable.
    
    g-golf now supports both Guile 3.0 and 2.2. Assign a new name to identify
    the g-golf for different Guile version.
    
    * gnu/packages/guile-xyz.scm (g-golf): Rename to guile-g-golf.
    (g-golf): Define as deprecated by guile-g-golf.
    
    Signed-off-by: Ludovic Courtès <[email-masked]>

Regards,
Florian

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 88bf074600..aa829e9215 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2547,9 +2547,9 @@ (define-public guile-sly
     (home-page "https://dthompson.us/projects/sly.html")
     (license license:gpl3+)))
 
-(define-public guile-g-golf
+(define-public g-golf
   (package
-    (name "guile-g-golf")
+    (name "g-golf")
     (version "0.8.0")
     (source
      (origin
@@ -2637,6 +2637,11 @@ (define-public guile-g-golf
 are unaffected.")
     (license license:lgpl3+)))
 
+(define-public guile-g-golf
+  ;; Deprecated because of G-Golf author's explicit request for an exception
+  ;; from usual naming conventions.  <https://bugs.gnu.org/76377>
+  (deprecated-package "guile-g-golf" g-golf))
+
 (define-public g-golf
   ;; Use ‘guile-g-golf’ above in package inputs and other code.  This alias
   ;; exists as a compromise, see
@@ -2647,16 +2652,16 @@ (define-public g-golf
 
 (define-public guile2.2-g-golf
   (package
-    (inherit guile-g-golf)
+    (inherit g-golf)
     (name "guile2.2-g-golf")
     (inputs
-     (modify-inputs (package-inputs guile-g-golf)
+     (modify-inputs (package-inputs g-golf)
        (replace "guile" guile-2.2)
        (replace "guile-lib" guile2.2-lib)))))
 
 (define-public g-golf-gtk-4-examples
   (package
-    (inherit guile-g-golf)
+    (inherit g-golf)
     (name "g-golf-gtk-4-examples")
     (arguments
      (list
@@ -2737,7 +2742,7 @@ (define-public g-golf-gtk-4-examples
             (add-after 'install 'wrap-binaries
               (lambda* (#:key inputs #:allow-other-keys)
                 (let* ((version (target-guile-effective-version))
-                       (g-golf (assoc-ref inputs "guile-g-golf"))
+                       (g-golf (assoc-ref inputs "g-golf"))
                        (gcairo (assoc-ref inputs "guile-cairo-next"))
                        (adwaita-icons (assoc-ref inputs "adwaita-icon-theme"))
                        (scm (string-append "/share/guile/site/" version))
@@ -2816,7 +2821,7 @@ (define-public g-golf-gtk-4-examples
            gtk
            guile-3.0
            guile-cairo-next
-           guile-g-golf))
+           g-golf))
     (native-inputs
      (list pkg-config
            which
@@ -2845,7 +2850,7 @@ (define-public g-golf-gtk-4-examples
 
 (define-public g-golf-adw-1-examples
   (package
-    (inherit guile-g-golf)
+    (inherit g-golf)
     (name "g-golf-adw-1-examples")
     (build-system glib-or-gtk-build-system)
     (arguments
@@ -2921,7 +2926,7 @@ (define-public g-golf-adw-1-examples
             (add-after 'install 'wrap-binaries
               (lambda* (#:key inputs #:allow-other-keys)
                 (let* ((version (target-guile-effective-version))
-                       (g-golf (assoc-ref inputs "guile-g-golf"))
+                       (g-golf (assoc-ref inputs "g-golf"))
                        (adwaita-icons (assoc-ref inputs "adwaita-icon-theme"))
                        (libadwaita-icons (assoc-ref inputs "libadwaita"))
                        (scm (string-append "/share/guile/site/" version))
@@ -2967,7 +2972,7 @@ (define-public g-golf-adw-1-examples
            (librsvg-for-system)
            gtk
            guile-3.0
-           guile-g-golf))
+           g-golf))
     (native-inputs (list `(,glib "bin") ;for glib-compile-resources
                          guile-3.0))
     (propagated-inputs (list))

base-commit: 150df457d1e269790f184510c58d031ee00a9ebb
-- 
2.48.1