Toggle diff (97 lines)
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