From 8725fcb10f8029b00765ed3f868a59b0ad3352bd Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 24 Nov 2024 11:42:43 +0000
Subject: [PATCH] gnu: go-github-com-spf13-pflag: Move to golang-xyz.

* gnu/packages/golang.scm (go-github-com-spf13-pflag): Move from here ...
* gnu/packages/golang-xyz.scm: ... to here.

Change-Id: I15be5ebbc1b2c200267676ae0c8b88fc2e062e85
---
 gnu/packages/golang-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++-
 gnu/packages/golang.scm     | 38 -----------------------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index ae1b600fe5..3ba2879400 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
 ;;; Copyright © 2019, 2021 Vagrant Cascadian <vagrant@debian.org>
 ;;; Copyright © 2019-2021 Martin Becze <mjbecze@riseup.net>
-;;; Copyright © 2019-2022, 2024 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019-2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
@@ -7324,6 +7324,44 @@ (define-public go-github-com-spf13-jwalterweatherman
 @end itemize")
     (license license:expat)))
 
+;; XXX: Not maintained for 3y, see
+;; <https://github.com/spf13/pflag/issues/385>.
+(define-public go-github-com-spf13-pflag
+  (package
+    (name "go-github-com-spf13-pflag")
+    (version "1.0.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/spf13/pflag")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31"))
+       (snippet
+        #~(begin
+            (use-modules (guix build utils))
+            ;; Fix compatibility with go-1.19+
+            ;; https://github.com/spf13/pflag/issues/368
+            (substitute* "flag_test.go"
+              (("fmt\\.Println") "fmt.Print")
+              (("\\+ got\\)") "+ got + \"\\n\")")
+              (("\\+ defaultOutput\\)") "+ defaultOutput + \"\\n\")"))))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/spf13/pflag"))
+    (home-page "https://github.com/spf13/pflag")
+    (synopsis "Replacement for Go's @code{flag} package")
+    (description
+     "Pflag is library to replace Go's @code{flag} package.  It implements
+POSIX/GNU-style command-line options with double hyphens.  It is is compatible
+with the
+@uref{https://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html,
+GNU extensions} to the POSIX recommendations for command-line options.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-stathat-go
   (let ((commit "74669b9f388d9d788c97399a0824adbfee78400e")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f0263e8dc5..21979fdd7f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3179,44 +3179,6 @@ (define-public go-github-com-google-cadvisor
 containers.")
       (license license:asl2.0))))
 
-;; XXX: Not maintained for 3y, see
-;; <https://github.com/spf13/pflag/issues/385>.
-(define-public go-github-com-spf13-pflag
-  (package
-    (name "go-github-com-spf13-pflag")
-    (version "1.0.5")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/spf13/pflag")
-               (commit (string-append "v" version))))
-        (file-name (git-file-name name version))
-        (sha256
-         (base32
-          "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31"))
-        (snippet
-         #~(begin
-             (use-modules (guix build utils))
-             ;; Fix compatibility with go-1.19+
-             ;; https://github.com/spf13/pflag/issues/368
-             (substitute* "flag_test.go"
-               (("fmt\\.Println") "fmt.Print")
-               (("\\+ got\\)") "+ got + \"\\n\")")
-               (("\\+ defaultOutput\\)") "+ defaultOutput + \"\\n\")"))))))
-    (build-system go-build-system)
-    (arguments
-      '(#:import-path "github.com/spf13/pflag"))
-    (home-page "https://github.com/spf13/pflag")
-    (synopsis "Replacement for Go's @code{flag} package")
-    (description
-     "Pflag is library to replace Go's @code{flag} package.  It implements
-POSIX/GNU-style command-line options with double hyphens.  It is is compatible
-with the
-@uref{https://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html,
-GNU extensions} to the POSIX recommendations for command-line options.")
-    (license license:bsd-3)))
-
 (define-public go-github-com-spf13-viper
   (package
     (name "go-github-com-spf13-viper")