gnu: go-github-com-urfave-cli: Move to golang-xyz.

* gnu/packages/golang.scm (go-github-com-urfave-cli,
go-github-com-urfave-cli-v2): Move from here ...
* gnu/packages/golang-xyz.scm: ... to here.

* gnu/packages/curl.scm: Add golang-xyz module.

Change-Id: Ic6fc7a312c0c7bccb47451ec2b9500c8ab1927de

3 files changed, 53 insertions, 51 deletions

diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index e5e3342b6d..ecc13a04e5 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -51,6 +51,7 @@
   #:use-module (gnu packages compression)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
+  #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages kerberos)
   #:use-module (gnu packages logging)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 849f7dbd39..3895c98e39 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -8107,6 +8107,58 @@ supported by the time package
 @code{ioutil} packages that is easy to test.")
     (license license:expat)))
 
+(define-public go-github-com-urfave-cli
+  (package
+    (name "go-github-com-urfave-cli")
+    (version "1.22.16")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/urfave/cli")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "022abbjwr3g2vbyfbdc1hg09d753hfba21b69n2nkrx168ag5ahd"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/urfave/cli"))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs
+     (list go-github-com-go-md2man))
+    (home-page "https://github.com/urfave/cli")
+    (synopsis "Simple, fast, and fun package for building command line apps in Go")
+    (description
+     "@command{cli} is a simple, fast, and fun package for building command
+line apps in Go.  The goal is to enable developers to write fast and
+distributable command line applications in an expressive way.")
+    (license license:expat)))
+
+(define-public go-github-com-urfave-cli-v2
+  (package
+    (inherit go-github-com-urfave-cli)
+    (name "go-github-com-urfave-cli-v2")
+    (version "2.27.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/urfave/cli")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "03237hi2jqvms9cif4varyap3j1dhzcf1mr809dm7ncvzk7gxg83"))))
+    (arguments
+     (list #:import-path "github.com/urfave/cli/v2"))
+    (propagated-inputs
+     (list go-github-com-burntsushi-toml
+           go-github-com-go-md2man
+           go-github-com-xrash-smetrics
+           go-gopkg-in-yaml-v3))))
+
+
 (define-public go-github-com-vitrun-qart
   (let ((commit "bf64b92db6b05651d6c25a3dabf2d543b360c0aa")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3784ec9a42..7bc97083e0 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4209,57 +4209,6 @@ references.")
       (description "A @command{.gitignore} parser for Go.")
       (license license:expat))))
 
-(define-public go-github-com-urfave-cli
-  (package
-    (name "go-github-com-urfave-cli")
-    (version "1.22.16")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/urfave/cli")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "022abbjwr3g2vbyfbdc1hg09d753hfba21b69n2nkrx168ag5ahd"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/urfave/cli"))
-    (native-inputs
-     (list go-github-com-stretchr-testify))
-    (propagated-inputs
-     (list go-github-com-go-md2man))
-    (home-page "https://github.com/urfave/cli")
-    (synopsis "Simple, fast, and fun package for building command line apps in Go")
-    (description "@command{cli} is a simple, fast, and fun package for
-building command line apps in Go.  The goal is to enable developers to write
-fast and distributable command line applications in an expressive way.")
-    (license license:expat)))
-
-(define-public go-github-com-urfave-cli-v2
-  (package
-    (inherit go-github-com-urfave-cli)
-    (name "go-github-com-urfave-cli-v2")
-    (version "2.27.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/urfave/cli")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "03237hi2jqvms9cif4varyap3j1dhzcf1mr809dm7ncvzk7gxg83"))))
-    (arguments
-     '(#:import-path "github.com/urfave/cli/v2"))
-    (propagated-inputs
-     (list go-github-com-burntsushi-toml
-           go-github-com-go-md2man
-           go-github-com-xrash-smetrics
-           go-gopkg-in-yaml-v3))))
-
 (define-public go-github-com-go-md2man
   (package
     (name "go-github-com-go-md2man")