19/20: gnu: go-github-com-gdamore-tcell: Move to golang-xyz.

[guix-commits]

sharlatan pushed a commit to branch go-team
in repository guix.

commit 88045b67b0364dd25052fd6f5313e109a8513f71
Author: Sharlatan Hellseher <sharlatanus@gmail.com>
AuthorDate: Sun Nov 24 21:38:31 2024 +0000

    gnu: go-github-com-gdamore-tcell: Move to golang-xyz.
    
    * gnu/packages/golang.scm (go-github-com-gdamore-tcell,
    go-github-com-gdamore-tcell-v2, go-github-com-delthas-tcell-v2): Move
    from here ...
    * gnu/packages/golang-xyz.scm: ... to here.
    
    * gnu/packages/games.scm: Add golang-xyz module.
    
    Change-Id: I47dc5ef691bbb9732a1e7e068c74aeaafb07b235
---
 gnu/packages/games.scm      |  1 +
 gnu/packages/golang-xyz.scm | 74 +++++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/golang.scm     | 72 -------------------------------------------
 3 files changed, 75 insertions(+), 72 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 39e3b6dc0b..c732d115bd 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -157,6 +157,7 @@
   #:use-module (gnu packages gnuzilla)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
+  #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages graphviz)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 821ed49736..d33cf47d85 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -19,6 +19,7 @@
 ;;; Copyright © 2021 Collin J. Doering <collin@rekahsoft.ca>
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021 Guix Together <jgart@dismail.de>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
 ;;; Copyright © 2021 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
 ;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net>
@@ -3029,6 +3030,79 @@ Differentiation between text and binary files}.
 @end itemize")
     (license license:expat)))
 
+(define-public go-github-com-gdamore-tcell
+  (package
+    (name "go-github-com-gdamore-tcell")
+    (version "1.4.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/gdamore/tcell";)
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "178h7kj4zb8lcw84nbqanapnxrgvhq4111xw4fj6m56y46anlzwg"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/gdamore/tcell"))
+    (inputs
+     (list go-github-com-gdamore-encoding
+           go-github-com-mattn-go-runewidth
+           go-github-com-lucasb-eyer-go-colorful
+           go-golang-org-x-sys
+           go-golang-org-x-text))
+    (home-page "https://github.com/gdamore/tcell";)
+    (synopsis "Provide a cell-based view for text terminals")
+    (description
+     "This package includes a full parser and expander for terminfo
+capability strings to avoid hard-coding escape strings for formatting.  It
+also favors portability, and includes support for all POSIX systems.")
+    (license license:asl2.0)))
+
+(define-public go-github-com-gdamore-tcell-v2
+  (package
+    (inherit go-github-com-gdamore-tcell)
+    (name "go-github-com-gdamore-tcell-v2")
+    (version "2.7.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/gdamore/tcell";)
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "05b22sgyf8lnwjddxlfvlj7i8b67gnidhbnz86vvx8fddggpa5nd"))))
+    (arguments
+     (list
+      #:import-path "github.com/gdamore/tcell/v2"))
+    (propagated-inputs
+     (modify-inputs (package-inputs go-github-com-gdamore-tcell)
+       (prepend go-golang-org-x-term go-golang-org-x-sys)))))
+
+(define-public go-github-com-delthas-tcell-v2
+  ;; TODO This variant allows upgrading senpai, and looks to be unnecessary in
+  ;; the next release of senpai
+  (hidden-package
+   (package
+     (inherit go-github-com-gdamore-tcell)
+     (name "go-github-com-delthas-tcell")
+     (version "2.4.1")
+     (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/delthas/tcell";)
+              (commit "837a7d7")))
+        (file-name (git-file-name name version))
+        (sha256
+         (base32 "05zr73q38dawl7hr6g7v4pkyv6mqr0zp2l9qsgn7xmf1p9q4bn7j"))))
+     (propagated-inputs
+      (modify-inputs (package-inputs go-github-com-gdamore-tcell)
+        (prepend go-golang-org-x-term go-golang-org-x-sys))))))
+
 (define-public go-github-com-go-git-go-billy-v5
   (package
     (name "go-github-com-go-git-go-billy-v5")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 414f343a56..288393ec80 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4480,78 +4480,6 @@ encoding in Go.")
 over strings.")
     (license license:expat)))
 
-(define-public go-github-com-gdamore-tcell
-    (package
-      (name "go-github-com-gdamore-tcell")
-      (version "1.4.0")
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/gdamore/tcell";)
-               (commit (string-append "v" version))))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32
-           "178h7kj4zb8lcw84nbqanapnxrgvhq4111xw4fj6m56y46anlzwg"))))
-      (build-system go-build-system)
-      (arguments
-       `(#:import-path "github.com/gdamore/tcell"))
-      (inputs
-       (list go-github-com-mattn-go-runewidth
-             go-github-com-lucasb-eyer-go-colorful
-             go-golang-org-x-text
-             go-golang-org-x-sys
-             go-github-com-gdamore-encoding))
-      (home-page "https://github.com/gdamore/tcell";)
-      (synopsis "Provide a cell-based view for text terminals")
-      (description "This package includes a full parser and expander for
-terminfo capability strings to avoid hard-coding escape strings for
-formatting.  It also favors portability, and includes support for all POSIX
-systems.")
-      (license license:asl2.0)))
-
-(define-public go-github-com-gdamore-tcell-v2
-    (package
-      (inherit go-github-com-gdamore-tcell)
-      (name "go-github-com-gdamore-tcell-v2")
-      (version "2.7.4")
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/gdamore/tcell";)
-                      (commit (string-append "v" version))))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "05b22sgyf8lnwjddxlfvlj7i8b67gnidhbnz86vvx8fddggpa5nd"))))
-      (arguments
-       (list #:import-path "github.com/gdamore/tcell/v2"))
-      (propagated-inputs
-       (modify-inputs (package-inputs go-github-com-gdamore-tcell)
-         (prepend go-golang-org-x-term go-golang-org-x-sys)))))
-
-(define-public go-github-com-delthas-tcell-v2
-  ;; TODO This variant allows upgrading senpai, and looks to be unnecessary in
-  ;; the next release of senpai
-  (hidden-package
-   (package
-     (inherit go-github-com-gdamore-tcell)
-     (name "go-github-com-delthas-tcell")
-     (version "2.4.1")
-     (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-              (url "https://github.com/delthas/tcell";)
-              (commit "837a7d7")))
-        (file-name (git-file-name name version))
-        (sha256
-         (base32 "05zr73q38dawl7hr6g7v4pkyv6mqr0zp2l9qsgn7xmf1p9q4bn7j"))))
-     (propagated-inputs (modify-inputs (package-inputs
-                                        go-github-com-gdamore-tcell)
-                          (prepend go-golang-org-x-term 
go-golang-org-x-sys))))))
-
 (define-public go-git-sr-ht-rockorager-tcell-term
   (package
     (name "go-git-sr-ht-rockorager-tcell-term")