From 1d03ab99850a3d025dc0305372f82be8770b7afb Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 9 Aug 2024 20:39:32 +0100
Subject: gnu: go-github-com-delthas-go-localeinfo: Update to
 0.0.0-20240607105203-b2e834fc307d.

* gnu/packages/golang.scm (go-github-com-delthas-go-localeinfo): Update to 0.0.0-20240607105203-b2e834fc307d.

Change-Id: I229f3348e7d473fa13f7bb7a33894d49ef24e2d0
---
 gnu/packages/golang.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 50ac5328c6..936684d5f2 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7008,19 +7008,18 @@ (define-public go-github-com-delthas-go-libnp
       (license license:expat))))
 
 (define-public go-github-com-delthas-go-localeinfo
-  (let ((commit "686a1e18511819b2f1625f00437f6e1246c04a5d"))
     (package
       (name "go-github-com-delthas-go-localeinfo")
-      (version (git-version "0.0.0" "0" commit))
+      (version "0.0.0-20240607105203-b2e834fc307d")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
                        (url "https://github.com/delthas/go-localeinfo")
-                       (commit commit)))
+                       (commit (go-version->git-ref version))))
                 (file-name (git-file-name name version))
                 (sha256
                   (base32
-                    "0r0v42ggvyss8327nggwinxl42pj4l0dwz96g9wk1w8h8vmfrh0z"))))
+                    "0817lhic77sz9lxizy2rchwssp0vzl7qxbsfghcddg6ssy1n0zhj"))))
       (build-system go-build-system)
       (arguments `(#:tests? #f ; FIXME: tests assume certain locale
                    #:import-path "github.com/delthas/go-localeinfo"))
@@ -7028,7 +7027,7 @@ (define-public go-github-com-delthas-go-localeinfo
       (synopsis "Library for extracting locale information")
       (description "@code{go-localeinfo} extracts monetary/numeric/time
 formatting information, rather than the current locale name.")
-      (license license:expat))))
+      (license license:expat)))
 
 (define-public go-github-com-zalando-go-keyring
   (package
-- 
cgit v1.2.3


From be1c87629672e6313f312a6d110fda87877e4c1c Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 9 Aug 2024 20:40:01 +0100
Subject: gnu: go-github-com-delthas-go-localeinfo: Fix indentation.

* gnu/packages/golang.scm (go-github-com-delthas-go-localeinfo): Fix indentation.

Change-Id: Ida11ab38911568c1967d42d7b4e4e7b950417661
---
 gnu/packages/golang.scm | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 936684d5f2..f31f08994c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7008,26 +7008,26 @@ (define-public go-github-com-delthas-go-libnp
       (license license:expat))))
 
 (define-public go-github-com-delthas-go-localeinfo
-    (package
-      (name "go-github-com-delthas-go-localeinfo")
-      (version "0.0.0-20240607105203-b2e834fc307d")
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                       (url "https://github.com/delthas/go-localeinfo")
-                       (commit (go-version->git-ref version))))
-                (file-name (git-file-name name version))
-                (sha256
-                  (base32
-                    "0817lhic77sz9lxizy2rchwssp0vzl7qxbsfghcddg6ssy1n0zhj"))))
-      (build-system go-build-system)
-      (arguments `(#:tests? #f ; FIXME: tests assume certain locale
-                   #:import-path "github.com/delthas/go-localeinfo"))
-      (home-page "https://github.com/delthas/go-localeinfo")
-      (synopsis "Library for extracting locale information")
-      (description "@code{go-localeinfo} extracts monetary/numeric/time
+  (package
+    (name "go-github-com-delthas-go-localeinfo")
+    (version "0.0.0-20240607105203-b2e834fc307d")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/delthas/go-localeinfo")
+                    (commit (go-version->git-ref version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0817lhic77sz9lxizy2rchwssp0vzl7qxbsfghcddg6ssy1n0zhj"))))
+    (build-system go-build-system)
+    (arguments `(#:tests? #f ; FIXME: tests assume certain locale
+                 #:import-path "github.com/delthas/go-localeinfo"))
+    (home-page "https://github.com/delthas/go-localeinfo")
+    (synopsis "Library for extracting locale information")
+    (description "@code{go-localeinfo} extracts monetary/numeric/time
 formatting information, rather than the current locale name.")
-      (license license:expat)))
+    (license license:expat)))
 
 (define-public go-github-com-zalando-go-keyring
   (package
-- 
cgit v1.2.3


From e42c5a247c278c0eb402b9d9237ba56ba38d69d3 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 9 Aug 2024 21:31:01 +0100
Subject: gnu: go-github-com-rogpeppe-go-internal: Update to 1.12.0.

* gnu/packages/golang.scm (go-github-com-rogpeppe-go-internal): Update to 1.12.0.

Change-Id: Ibe33dd457328a61a2b919b61d5b9d1816ca60b81
---
 gnu/packages/golang.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f31f08994c..9a7859236e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7089,7 +7089,7 @@ (define-public go-github-com-zclconf-go-cty
 (define-public go-github-com-rogpeppe-go-internal
   (package
     (name "go-github-com-rogpeppe-go-internal")
-    (version "1.9.0")
+    (version "1.12.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -7098,7 +7098,7 @@ (define-public go-github-com-rogpeppe-go-internal
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0bh08k8fy1qcc0vzyv0xkg0sx5kjx348zd1dpjmp3rbrr6xrpaaw"))))
+                "18szjxqrjjvgsvyjbkqs6xw4bvg5nn1myg5hhb5qzwz5xl4wvw5a"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/rogpeppe/go-internal"
-- 
cgit v1.2.3


From b6332821c211a6e788d5a9ff576b56e0e4038aaa Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 9 Aug 2024 21:34:26 +0100
Subject: gnu: go-github-com-rogpeppe-go-internal: Move to golang-xyz.

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

Change-Id: Id061201d8454371eedff5f2115a36cf3d9ccb0b3
---
 gnu/packages/golang-xyz.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/golang.scm     | 46 --------------------------------------------
 2 files changed, 47 insertions(+), 46 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index c89798f15f..26fdf7671f 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -4735,6 +4735,53 @@ (define-public go-github-com-remeh-sizedwaitgroup
 not overload the given database.")
     (license license:expat)))
 
+(define-public go-github-com-rogpeppe-go-internal
+  (package
+    (name "go-github-com-rogpeppe-go-internal")
+    (version "1.12.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/rogpeppe/go-internal")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "18szjxqrjjvgsvyjbkqs6xw4bvg5nn1myg5hhb5qzwz5xl4wvw5a"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/rogpeppe/go-internal"
+      ;; Source-only package
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (delete 'build))))
+    (propagated-inputs
+     (list go-github-com-pkg-diff))
+    (home-page "https://github.com/rogpeppe/go-internal/")
+    (synopsis "Internal packages from the Go standard library")
+    (description "This repository factors out an opinionated selection of
+internal packages and functionality from the Go standard library.  Currently
+this consists mostly of packages and testing code from within the Go tool
+implementation.
+
+Included are the following:
+@itemize
+@item dirhash: calculate hashes over directory trees the same way that the Go tool does.
+@item goproxytest: a GOPROXY implementation designed for test use.
+@item gotooltest: Use the Go tool inside test scripts (see testscript below)
+@item imports: list of known architectures and OSs, and support for reading import import statements.
+@item modfile: read and write go.mod files while preserving formatting and comments.
+@item module: module paths and versions.
+@item par: do work in parallel.
+@item semver: semantic version parsing.
+@item testenv: information on the current testing environment.
+@item testscript: script-based testing based on txtar files
+@item txtar: simple text-based file archives for testing.
+@end itemize\n")
+    (license license:bsd-3)))
+
 (define-public go-github-com-schollz-progressbar-v3
   (package
     (name "go-github-com-schollz-progressbar-v3")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 9a7859236e..d02f2d96e9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7086,52 +7086,6 @@ (define-public go-github-com-zclconf-go-cty
 configuration languages, but other uses may be possible too.")
     (license license:expat)))
 
-(define-public go-github-com-rogpeppe-go-internal
-  (package
-    (name "go-github-com-rogpeppe-go-internal")
-    (version "1.12.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/rogpeppe/go-internal")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "18szjxqrjjvgsvyjbkqs6xw4bvg5nn1myg5hhb5qzwz5xl4wvw5a"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/rogpeppe/go-internal"
-       ; Source-only package
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'build))))
-    (propagated-inputs
-     (list go-github-com-pkg-diff))
-    (home-page "https://github.com/rogpeppe/go-internal/")
-    (synopsis "Internal packages from the Go standard library")
-    (description "This repository factors out an opinionated selection of
-internal packages and functionality from the Go standard library.  Currently
-this consists mostly of packages and testing code from within the Go tool
-implementation.
-
-Included are the following:
-@itemize
-@item dirhash: calculate hashes over directory trees the same way that the Go tool does.
-@item goproxytest: a GOPROXY implementation designed for test use.
-@item gotooltest: Use the Go tool inside test scripts (see testscript below)
-@item imports: list of known architectures and OSs, and support for reading import import statements.
-@item modfile: read and write go.mod files while preserving formatting and comments.
-@item module: module paths and versions.
-@item par: do work in parallel.
-@item semver: semantic version parsing.
-@item testenv: information on the current testing environment.
-@item testscript: script-based testing based on txtar files
-@item txtar: simple text-based file archives for testing.
-@end itemize\n")
-    (license license:bsd-3)))
-
 (define-public go-gopkg-in-errgo-fmt-errors
   (package
     (name "go-gopkg-in-errgo-fmt-errors")
-- 
cgit v1.2.3


From 63e36f3a8b518af9c5d21ce4c69661322eec25bb Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 9 Aug 2024 21:06:50 +0100
Subject: gnu: go-mvdan-cc-xurls: Swap inheritance.

These changes simplify packages by swapping inheritance from Golang
module instead of the final binary for go-mvdan-cc-xurls and xurls
variables.

* gnu/packages/golang.scm (go-mvdan-cc-xurls): Simplify package.
[arguments]: <#:phases>: Remove phases modification.
(xurls): Inherit from go-mvdan-cc-xurls.

Change-Id: I746e8c02afa8ea5341ae0043a05d43631ed1d032
---
 gnu/packages/golang.scm | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d02f2d96e9..fafc05c8f9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7492,9 +7492,9 @@ (define-public go-mvdan-cc-unparam
     (native-inputs '())
     (inputs '())))
 
-(define-public xurls
+(define-public go-mvdan-cc-xurls
   (package
-    (name "xurls")
+    (name "go-mvdan-cc-xurls")
     (version "2.4.0")
     (source (origin
               (method git-fetch)
@@ -7507,15 +7507,7 @@ (define-public xurls
                 "0b040nbk1vwlk1qljavh8w8fn2r243q700n6gr8j2asmnz0xq84p"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "mvdan.cc/xurls/v2"
-       #:unpack-path "mvdan.cc/xurls/v2"
-       #:phases (modify-phases %standard-phases
-                  (replace 'build
-                    (lambda arguments
-                      (apply (assoc-ref %standard-phases
-                                        'build)
-                             `(,@arguments #:import-path
-                               "mvdan.cc/xurls/v2/cmd/xurls")))))))
+     `(#:import-path "mvdan.cc/xurls/v2"))
     (inputs (list go-golang-org-x-sync go-github-com-rogpeppe-go-internal))
     (home-page "https://mvdan.cc/xurls/v2/")
     (synopsis "Extracts URLs from text")
@@ -7524,19 +7516,14 @@ (define-public xurls
 be used as both a binary and a library.")
     (license license:bsd-3)))
 
-(define-public go-mvdan-cc-xurls
+(define-public xurls
   (package
-    (inherit xurls)
-    (name "go-mvdan-cc-xurls")
+    (inherit go-mvdan-cc-xurls)
+    (name "xurls")
     (arguments
-     `(#:import-path "mvdan.cc/xurls"
-       #:tests? #f
-       #:install-source? #t
-       #:phases (modify-phases %standard-phases
-                  (delete 'build))))
-    (propagated-inputs (package-inputs xurls))
-    (native-inputs '())
-    (inputs '())))
+     `(#:import-path "mvdan.cc/xurls/v2/cmd/xurls"
+       #:unpack-path "mvdan.cc/xurls/v2"
+       #:install-source? #f))))
 
 (define-public go-github-com-davecgh-go-xdr
   (package
-- 
cgit v1.2.3


From ddeb0130549014c2b3f3c52766ae8bbd4f7265f0 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 11 Aug 2024 11:38:31 +0100
Subject: gnu: go-mvdan-cc-xurls: Update to 2.5.0.

* gnu/packages/golang.scm (go-mvdan-cc-xurls): Update to 2.5.0.
[propagated-inputs]: Add go-golang-org-x-mod.
(xurls) [arguments]: <#:phases>: Add disable-failing-tests phase.

Change-Id: If9e2b955218913cb237eef7f643dab1d72fa129f
---
 gnu/packages/golang.scm | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index fafc05c8f9..2d7e2d1011 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7495,7 +7495,7 @@ (define-public go-mvdan-cc-unparam
 (define-public go-mvdan-cc-xurls
   (package
     (name "go-mvdan-cc-xurls")
-    (version "2.4.0")
+    (version "2.5.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -7504,11 +7504,14 @@ (define-public go-mvdan-cc-xurls
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0b040nbk1vwlk1qljavh8w8fn2r243q700n6gr8j2asmnz0xq84p"))))
+                "1516hwlxbnhdca56qy7sx9h2n5askq6ddqpqyp3f5rvmzdkxf4zn"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "mvdan.cc/xurls/v2"))
-    (inputs (list go-golang-org-x-sync go-github-com-rogpeppe-go-internal))
+    (propagated-inputs
+     (list go-github-com-rogpeppe-go-internal
+           go-golang-org-x-mod
+           go-golang-org-x-sync))
     (home-page "https://mvdan.cc/xurls/v2/")
     (synopsis "Extracts URLs from text")
     (description
@@ -7521,9 +7524,16 @@ (define-public xurls
     (inherit go-mvdan-cc-xurls)
     (name "xurls")
     (arguments
-     `(#:import-path "mvdan.cc/xurls/v2/cmd/xurls"
-       #:unpack-path "mvdan.cc/xurls/v2"
-       #:install-source? #f))))
+     (list
+      #:import-path "mvdan.cc/xurls/v2/cmd/xurls"
+      #:unpack-path "mvdan.cc/xurls/v2"
+      #:install-source? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'disable-failing-tests
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (delete-file "testdata/script/version.txtar")))))))))
 
 (define-public go-github-com-davecgh-go-xdr
   (package
-- 
cgit v1.2.3


From 4412d0e160824eaa402ae21f990969e279b387d0 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 11 Aug 2024 11:44:25 +0100
Subject: gnu: go-mvdan-cc-xurls: Move to golang-web.

* gnu/packages/golang.scm (go-mvdan-cc-xurls, xurls): Move from here...
* gnu/packages/golang-web.scm: ... to here.
* gnu/packages/messaging.scm: Add golang-web module.

Change-Id: I990e5dff7d5813dc4b1c40e9a7707901235af458
---
 gnu/packages/golang-web.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/golang.scm     | 43 -------------------------------------------
 gnu/packages/messaging.scm  |  1 +
 3 files changed, 45 insertions(+), 43 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 5c1ece7389..66b6050b17 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -3683,6 +3683,34 @@ (define-public go-gopkg-in-square-go-jose-v2
 Encryption, JSON Web Signature, and JSON Web Token standards.")
     (license license:asl2.0)))
 
+(define-public go-mvdan-cc-xurls
+  (package
+    (name "go-mvdan-cc-xurls")
+    (version "2.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/mvdan/xurls")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1516hwlxbnhdca56qy7sx9h2n5askq6ddqpqyp3f5rvmzdkxf4zn"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "mvdan.cc/xurls/v2"))
+    (propagated-inputs
+     (list go-github-com-rogpeppe-go-internal
+           go-golang-org-x-mod
+           go-golang-org-x-sync))
+    (home-page "https://mvdan.cc/xurls/v2/")
+    (synopsis "Extracts URLs from text")
+    (description
+     "Xurls extracts urls from plain text using regular expressions.  It can
+be used as both a binary and a library.")
+    (license license:bsd-3)))
+
 (define-public go-nhooyr-io-websocket
   (package
     (name "go-nhooyr-io-websocket")
@@ -3747,6 +3775,22 @@ (define-public go-minify
     (description "This package provides a CLI binary executible built from
 go-github-com-tdewolff-minify-v2 source.")))
 
+(define-public xurls
+  (package
+    (inherit go-mvdan-cc-xurls)
+    (name "xurls")
+    (arguments
+     (list
+      #:import-path "mvdan.cc/xurls/v2/cmd/xurls"
+      #:unpack-path "mvdan.cc/xurls/v2"
+      #:install-source? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'disable-failing-tests
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (delete-file "testdata/script/version.txtar")))))))))
+
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
 ;;; of a merge conflict, place them above by existing packages with similar
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 2d7e2d1011..c4b32e8378 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7492,49 +7492,6 @@ (define-public go-mvdan-cc-unparam
     (native-inputs '())
     (inputs '())))
 
-(define-public go-mvdan-cc-xurls
-  (package
-    (name "go-mvdan-cc-xurls")
-    (version "2.5.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/mvdan/xurls")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1516hwlxbnhdca56qy7sx9h2n5askq6ddqpqyp3f5rvmzdkxf4zn"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "mvdan.cc/xurls/v2"))
-    (propagated-inputs
-     (list go-github-com-rogpeppe-go-internal
-           go-golang-org-x-mod
-           go-golang-org-x-sync))
-    (home-page "https://mvdan.cc/xurls/v2/")
-    (synopsis "Extracts URLs from text")
-    (description
-     "Xurls extracts urls from plain text using regular expressions.  It can
-be used as both a binary and a library.")
-    (license license:bsd-3)))
-
-(define-public xurls
-  (package
-    (inherit go-mvdan-cc-xurls)
-    (name "xurls")
-    (arguments
-     (list
-      #:import-path "mvdan.cc/xurls/v2/cmd/xurls"
-      #:unpack-path "mvdan.cc/xurls/v2"
-      #:install-source? #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'disable-failing-tests
-            (lambda* (#:key import-path #:allow-other-keys)
-              (with-directory-excursion (string-append "src/" import-path)
-                (delete-file "testdata/script/version.txtar")))))))))
-
 (define-public go-github-com-davecgh-go-xdr
   (package
     (name "go-github-com-davecgh-go-xdr")
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 8509b0c71a..e9da7d00ee 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -94,6 +94,7 @@ (define-module (gnu packages messaging)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
+  #:use-module (gnu packages golang-web)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages graphviz)
-- 
cgit v1.2.3


From f72b76a29848c98e2880dd98fa8ac7d772b8f2a9 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 11 Aug 2024 12:51:15 +0100
Subject: gnu: go-github-com-gdamore-tcell-v2: Update to 2.7.4.

* gnu/packages/golang.scm (go-github-com-gdamore-tcell-v2): Update to 2.7.4.

Change-Id: I7df36179e2f2c6f335a9b4c1b9a4ab2a57dbc8b4
---
 gnu/packages/golang.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index c4b32e8378..80a4985191 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5302,7 +5302,7 @@ (define-public go-github-com-gdamore-tcell-v2
     (package
       (inherit go-github-com-gdamore-tcell)
       (name "go-github-com-gdamore-tcell")
-      (version "2.6.0")
+      (version "2.7.4")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -5311,7 +5311,7 @@ (define-public go-github-com-gdamore-tcell-v2
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "0126hi8glnfqdx4l9zlh6dhd5f5c8bws7arv9pp4n2kqcnhdc6g2"))))
+                  "05b22sgyf8lnwjddxlfvlj7i8b67gnidhbnz86vvx8fddggpa5nd"))))
       (arguments
        (list #:import-path "github.com/gdamore/tcell/v2"
              #:phases
-- 
cgit v1.2.3


From d1315bb2bab344f37ebfaa4572654ff78ea8e845 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 11 Aug 2024 12:58:23 +0100
Subject: gnu: go-github-com-google-shlex: Add project status comment.

* gnu/packages/golang.scm (go-github-com-google-shlex): Add project
status comment for the next maintenance cycle.

Change-Id: Ieaa2cc28f95306f87b0d358500225dbd0381adcf
---
 gnu/packages/golang.scm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 80a4985191..127ea58fc3 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8124,6 +8124,9 @@ (define-public go-github-com-google-go-jsonnet
 implementation.")
     (license license:asl2.0)))
 
+;; XXX: This repository has been archived by the owner on Dec 29, 2022. It is
+;; now read-only.  It's only used by kiln, consider to remove it when it does
+;; no longer require it.
 (define-public go-github-com-google-shlex
   (package
     (name "go-github-com-google-shlex")
-- 
cgit v1.2.3


From d275a15163a93b8155f86676b8966bece3882079 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 14 Aug 2024 18:06:14 +0100
Subject: gnu: go-github-com-kr-pretty: Update to 0.3.1.

* gnu/packages/golang.scm (go-github-com-kr-pretty): Update to 0.3.1.
[propagated-inputs]: Add go-github-com-rogpeppe-go-internal.

Change-Id: I80e8489e6a573206678d1dfe6c23aa0824a905fc
---
 gnu/packages/golang.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 127ea58fc3..ae62246697 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5072,7 +5072,7 @@ (define-public go-github-com-direnv-go-dotenv
 (define-public go-github-com-kr-pretty
   (package
     (name "go-github-com-kr-pretty")
-    (version "0.2.1")
+    (version "0.3.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -5081,10 +5081,10 @@ (define-public go-github-com-kr-pretty
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0vzfz06y9q8gs2nxx0kys0591vzp78k0fvpb8digi5n15h3b25hy"))))
+                "19d4ycy22il43s4pnr7jv1aahp87wa1p16zpis5jdiiyfgni2l8f"))))
     (build-system go-build-system)
     (propagated-inputs
-     (list go-github-com-kr-text))
+     (list go-github-com-kr-text go-github-com-rogpeppe-go-internal))
     (arguments
      '(#:import-path "github.com/kr/pretty"))
     (synopsis "Pretty printer for Go values")
-- 
cgit v1.2.3


From 5fb05d74ad183cb579146a12bb9b1d02b2516814 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 14 Aug 2024 18:10:13 +0100
Subject: gnu: go-github-com-kr-pretty: Move to golang-xyz.

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

Change-Id: Ifded1d309f10d25c982afaf20301bc151f1c8ba1
---
 gnu/packages/golang-xyz.scm | 28 +++++++++++++++++++++++++++-
 gnu/packages/golang.scm     | 23 -----------------------
 2 files changed, 27 insertions(+), 24 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 43b99f2c1b..8dad9f0757 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1,14 +1,15 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017-2020 Leo Famulari <leo@famulari.name>
-;;; Copyright © 2018 Christopher Baines <mail@cbaines.net>
 ;;; Copyright © 2018 Pierre Neidhardt <ambrevar@gmail.com>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2018, 2020 Christopher Baines <mail@cbaines.net>
 ;;; 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 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>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
@@ -3322,6 +3323,31 @@ (define-public go-github-com-klauspost-cpuid-v2
      (list
       #:import-path "github.com/klauspost/cpuid/v2"))))
 
+(define-public go-github-com-kr-pretty
+  (package
+    (name "go-github-com-kr-pretty")
+    (version "0.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/kr/pretty")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "19d4ycy22il43s4pnr7jv1aahp87wa1p16zpis5jdiiyfgni2l8f"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/kr/pretty"))
+    (propagated-inputs
+     (list go-github-com-kr-text go-github-com-rogpeppe-go-internal))
+    (home-page "https://github.com/kr/pretty")
+    (synopsis "Pretty printer for Go values")
+    (description
+     "This package provides a pretty printer for Go values.")
+    (license license:expat)))
+
 (define-public go-github-com-lestrrat-go-envload
   (package
     (name "go-github-com-lestrrat-go-envload")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ae62246697..753fd3f56c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5069,29 +5069,6 @@ (define-public go-github-com-direnv-go-dotenv
 format in Go.")
       (license license:expat))))
 
-(define-public go-github-com-kr-pretty
-  (package
-    (name "go-github-com-kr-pretty")
-    (version "0.3.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/kr/pretty")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "19d4ycy22il43s4pnr7jv1aahp87wa1p16zpis5jdiiyfgni2l8f"))))
-    (build-system go-build-system)
-    (propagated-inputs
-     (list go-github-com-kr-text go-github-com-rogpeppe-go-internal))
-    (arguments
-     '(#:import-path "github.com/kr/pretty"))
-    (synopsis "Pretty printer for Go values")
-    (description "This package provides a pretty printer for Go values.")
-    (home-page "https://github.com/kr/pretty")
-    (license license:expat)))
-
 (define-public go-github-com-kylelemons-godebug
   (package
     (name "go-github-com-kylelemons-godebug")
-- 
cgit v1.2.3


From 2de44c408669cf940bbe0416c81de9af998b98bd Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 14 Aug 2024 18:14:36 +0100
Subject: gnu: go-github-com-creack-pty: Update to 1.1.23.

* gnu/packages/golang.scm (go-github-com-creack-pty): Update to 1.1.23.

Change-Id: Ieb0c2186008f285658e46ea9b0fb1edb62cdb6d4
---
 gnu/packages/golang.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 753fd3f56c..0c92a52d31 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8283,7 +8283,7 @@ (define-public go-github-com-jaytaylor-html2text
 (define-public go-github-com-creack-pty
   (package
     (name "go-github-com-creack-pty")
-    (version "1.1.18")
+    (version "1.1.23")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -8292,7 +8292,7 @@ (define-public go-github-com-creack-pty
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1qqhcgfym0napz8damj7dhfw28g2qn2f5h3lr93i0sxawq926yzc"))))
+                "1chx7ml9wlpk8pzgnnxb97gblmxz1j1v37m5i1asb94l5c24r1fg"))))
     (build-system go-build-system)
     (arguments
      (list #:import-path "github.com/creack/pty"
-- 
cgit v1.2.3


From 662b7604b437355df51a505606804c1daa67efbf Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 14 Aug 2024 23:18:25 +0100
Subject: gnu: go-github-com-go-playground-locales: Update to 0.14.1.

* gnu/packages/golang.scm (go-github-com-go-playground-locales): Update to 0.14.1.

Change-Id: I6f8681dd49c8dd61b51481117b01566a9024ff15
---
 gnu/packages/golang.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0c92a52d31..c11b282875 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -2716,7 +2716,7 @@ (define-public go-github-com-jessevdk-go-flags
 (define-public go-github-com-go-playground-locales
   (package
     (name "go-github-com-go-playground-locales")
-    (version "0.13.0")
+    (version "0.14.1")
     (home-page "https://github.com/go-playground/locales")
     (source
      (origin
@@ -2726,7 +2726,7 @@ (define-public go-github-com-go-playground-locales
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0qydcpkvss3mf8mk3xzg6a34n8i69aydrigcl2apifrkx72jw7pf"))))
+        (base32 "117nss5gv7rfzr7z40rkpwfr273wv6ahrd3ycqdarxvaxh0ldhh4"))))
     (build-system go-build-system)
     (arguments
      '(#:import-path "github.com/go-playground/locales"))
-- 
cgit v1.2.3


From 2444a52d7ca62bf3abff3090ec912b159c18467a Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 14 Aug 2024 23:21:05 +0100
Subject: gnu: go-github-com-go-playground-locales: Move to golang-xyz.

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

Change-Id: I96ba608d2463911c184cedc9cfc7cb7556b1bbd9
---
 gnu/packages/golang-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++
 gnu/packages/golang.scm     | 36 ------------------------------------
 2 files changed, 36 insertions(+), 36 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index e1aeacd67c..5dae9d0d92 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -2458,6 +2458,42 @@ (define-public go-github-com-go-logr-logr
 while callers can implement logging with whatever backend is appropriate.")
     (license license:asl2.0)))
 
+(define-public go-github-com-go-playground-locales
+  (package
+    (name "go-github-com-go-playground-locales")
+    (version "0.14.1")
+    (home-page "https://github.com/go-playground/locales")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url home-page)
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "117nss5gv7rfzr7z40rkpwfr273wv6ahrd3ycqdarxvaxh0ldhh4"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:import-path "github.com/go-playground/locales"))
+    (propagated-inputs
+     (list go-golang-org-x-text))
+    (synopsis "Set of locales generated from the CLDR Unicode Project")
+    (description
+     "This package provides a set of locales generated from the
+@uref{http://cldr.unicode.org/, Unicode CLDR Project} which can be used
+independently or within an internalization (i18n) package.  Its currently
+implemented features include
+
+@itemize
+@item Rules generated from the CLDR data, v31.0.3
+@item Contains Cardinal, Ordinal and Range Plural Rules
+@item Contains Month, Weekday and Timezone translations built in
+@item Contains Date & Time formatting functions
+@item Contains Number, Currency, Accounting and Percent formatting functions
+@item Supports the \"Gregorian\" calendar only
+@end itemize")
+    (license license:expat)))
+
 (define-public go-github-com-go-task-slim-sprig
   (let ((commit "afa1e2071829e4db655eb448d6c7c16eb0bc5766")
         (revision "0"))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index c11b282875..a923fe6612 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -2713,42 +2713,6 @@ (define-public go-github-com-jessevdk-go-flags
     (home-page "https://github.com/jessevdk/go-flags")
     (license license:bsd-3)))
 
-(define-public go-github-com-go-playground-locales
-  (package
-    (name "go-github-com-go-playground-locales")
-    (version "0.14.1")
-    (home-page "https://github.com/go-playground/locales")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url home-page)
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "117nss5gv7rfzr7z40rkpwfr273wv6ahrd3ycqdarxvaxh0ldhh4"))))
-    (build-system go-build-system)
-    (arguments
-     '(#:import-path "github.com/go-playground/locales"))
-    (propagated-inputs
-     (list go-golang-org-x-text))
-    (synopsis "Set of locales generated from the CLDR Unicode Project")
-    (description
-     "This package provides a set of locales generated from the
-@uref{http://cldr.unicode.org/, Unicode CLDR Project} which can be used
-independently or within an internalization (i18n) package.  Its currently
-implemented features include
-
-@itemize
-@item Rules generated from the CLDR data, v31.0.3
-@item Contains Cardinal, Ordinal and Range Plural Rules
-@item Contains Month, Weekday and Timezone translations built in
-@item Contains Date & Time formatting functions
-@item Contains Number, Currency, Accounting and Percent formatting functions
-@item Supports the \"Gregorian\" calendar only
-@end itemize")
-    (license license:expat)))
-
 (define-public go-github-com-go-playground-universal-translator
   (package
     (name "go-github-com-go-playground-universal-translator")
-- 
cgit v1.2.3


From 1e81c70e42c6e09c90c58119adea16d79409165a Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 14 Aug 2024 23:28:30 +0100
Subject: gnu: go-github-com-pelletier-go-toml: Remove input labels.

* gnu/packages/golang.scm (go-github-com-pelletier-go-toml): Remove
input lables, swap [native-inputs] to [propagated-inputs] to simplify
dependent packages inputs.

Change-Id: Ibfa57fbe606ced8bf9f2bcfe4065bf94f84bc0fb
---
 gnu/packages/golang.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index a923fe6612..3e1814c20c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3590,10 +3590,10 @@ (define-public go-github-com-pelletier-go-toml
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/pelletier/go-toml"))
-    (native-inputs
-     `(("github.com/BurntSushi/toml" ,go-github-com-burntsushi-toml)
-       ("github.com/davecgh/go-spew" ,go-github-com-davecgh-go-spew)
-       ("gopkg.in/yaml.v2" ,go-gopkg-in-yaml-v2)))
+    (propagated-inputs
+     (list go-github-com-burntsushi-toml
+           go-github-com-davecgh-go-spew
+           go-gopkg-in-yaml-v2))
     (home-page "https://github.com/pelletier/go-toml")
     (synopsis "Go library for the TOML configuration language")
     (description "Go library for the TOML configuration language")
-- 
cgit v1.2.3


From 751b0e5881d3b64c7ae07e164594d7157aad0e98 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 14 Aug 2024 23:32:29 +0100
Subject: gnu: go-github-com-pelletier-go-toml: Update to 1.9.5.

* gnu/packages/golang.scm (go-github-com-pelletier-go-toml): Update to 1.9.5.

Change-Id: Ib72f88b2f14c8b1b293ebb3cd64645f5265c7b11
---
 gnu/packages/golang.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3e1814c20c..ce0041edbb 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3576,7 +3576,7 @@ (define-public go-github-com-magiconair-properties
 (define-public go-github-com-pelletier-go-toml
   (package
     (name "go-github-com-pelletier-go-toml")
-    (version "1.9.3")
+    (version "1.9.5")
     (source
      (origin
        (method git-fetch)
@@ -3586,7 +3586,7 @@ (define-public go-github-com-pelletier-go-toml
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0cqwnvlgs1wgdgjxlwv8j52f7d6syniadr51sjh2fya99m5wzvsn"))))
+         "1wypjrr1axkrkzp4n5gvams94f2sd7dq1pdpd2i35sgpdz6r2m6g"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/pelletier/go-toml"))
-- 
cgit v1.2.3


From 3b3f3891c68f8247190643a02f7fa86a580e8f34 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 14 Aug 2024 23:26:39 +0100
Subject: gnu: go-github-com-pelletier-go-toml-v2: Update to 2.2.2.

* gnu/packages/golang.scm (go-github-com-pelletier-go-toml-v2): Update to 2.2.2.

Change-Id: Ib3c42010d207644359b4a693569c31c5d9406e7b
---
 gnu/packages/golang.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ce0041edbb..4c6b04cd62 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3603,7 +3603,7 @@ (define-public go-github-com-pelletier-go-toml-v2
   (package
     (inherit go-github-com-pelletier-go-toml)
     (name "go-github-com-pelletier-go-toml-v2")
-    (version "2.1.1")
+    (version "2.2.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -3612,12 +3612,13 @@ (define-public go-github-com-pelletier-go-toml-v2
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1k0rwg7870f4va7jaavnpwvdn6d76gxgyr7c978bx2h829a9sx2a"))))
+                "0gimgz33yxmvj0nmy56yy7zq4ay8j55ir8pfzmgwga7npgpzspk7"))))
     (build-system go-build-system)
     (arguments
      (list #:import-path "github.com/pelletier/go-toml/v2"))
     (native-inputs
-     (list go-github-com-stretchr-testify))))
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs '())))
 
 (define-public go-github-com-subosito-gotenv
   (package
-- 
cgit v1.2.3


From 3948cbe9aa405bfeb2c0d6b88573cd26c312ee02 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 14 Aug 2024 23:39:51 +0100
Subject: gnu: go-github-com-pelletier-go-toml: Move to golang-xyz.

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

Change-Id: I76dae5d71ae761af6d7f23ce55286996c55a5d50
---
 gnu/packages/golang-xyz.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++
 gnu/packages/golang.scm     | 47 ---------------------------------------------
 2 files changed, 47 insertions(+), 47 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 600c9ff6d7..65aa50726f 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -4694,6 +4694,53 @@ (define-public go-github-com-pbnjay-memory
 processes.")
       (license license:bsd-3))))
 
+(define-public go-github-com-pelletier-go-toml
+  (package
+    (name "go-github-com-pelletier-go-toml")
+    (version "1.9.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/pelletier/go-toml")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1wypjrr1axkrkzp4n5gvams94f2sd7dq1pdpd2i35sgpdz6r2m6g"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:import-path "github.com/pelletier/go-toml"))
+    (propagated-inputs
+     (list go-github-com-burntsushi-toml
+           go-github-com-davecgh-go-spew
+           go-gopkg-in-yaml-v2))
+    (home-page "https://github.com/pelletier/go-toml")
+    (synopsis "Go library for the TOML configuration language")
+    (description
+     "Go library for the TOML configuration language")
+    (license license:expat)))
+
+(define-public go-github-com-pelletier-go-toml-v2
+  (package
+    (inherit go-github-com-pelletier-go-toml)
+    (name "go-github-com-pelletier-go-toml-v2")
+    (version "2.2.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/pelletier/go-toml")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0gimgz33yxmvj0nmy56yy7zq4ay8j55ir8pfzmgwga7npgpzspk7"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:import-path "github.com/pelletier/go-toml/v2"))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs '())))
+
 (define-public go-github-com-pierrec-cmdflag
   (package
     (name "go-github-com-pierrec-cmdflag")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4c6b04cd62..77d9a4f065 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3573,53 +3573,6 @@ (define-public go-github-com-magiconair-properties
     (description "Java properties scanner for Go")
     (license license:bsd-2)))
 
-(define-public go-github-com-pelletier-go-toml
-  (package
-    (name "go-github-com-pelletier-go-toml")
-    (version "1.9.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/pelletier/go-toml")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1wypjrr1axkrkzp4n5gvams94f2sd7dq1pdpd2i35sgpdz6r2m6g"))))
-    (build-system go-build-system)
-    (arguments
-     `(#:import-path "github.com/pelletier/go-toml"))
-    (propagated-inputs
-     (list go-github-com-burntsushi-toml
-           go-github-com-davecgh-go-spew
-           go-gopkg-in-yaml-v2))
-    (home-page "https://github.com/pelletier/go-toml")
-    (synopsis "Go library for the TOML configuration language")
-    (description "Go library for the TOML configuration language")
-    (license license:expat)))
-
-(define-public go-github-com-pelletier-go-toml-v2
-  (package
-    (inherit go-github-com-pelletier-go-toml)
-    (name "go-github-com-pelletier-go-toml-v2")
-    (version "2.2.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/pelletier/go-toml")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0gimgz33yxmvj0nmy56yy7zq4ay8j55ir8pfzmgwga7npgpzspk7"))))
-    (build-system go-build-system)
-    (arguments
-     (list #:import-path "github.com/pelletier/go-toml/v2"))
-    (native-inputs
-     (list go-github-com-stretchr-testify))
-    (propagated-inputs '())))
-
 (define-public go-github-com-subosito-gotenv
   (package
     (name "go-github-com-subosito-gotenv")
-- 
cgit v1.2.3


From 7fe99a5fafcab6161bcc497dfd6c8e5c97b39271 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 14 Aug 2024 23:51:42 +0100
Subject: gnu: go-github-com-stretchr-objx: Update to 0.5.2.

* gnu/packages/golang.scm (go-github-com-stretchr-objx): Update to 0.5.2.
[source]: Remove snippet as "vendor" directory is not provided.
[inputs]: Remove go-github-com-stretchr-testify-bootstrap.
[propagated-inputs]: Remove go-github-com-davecgh-go-spew and
go-github-com-pmezard-go-difflib.
[native-inputs]: Add go-github-com-davecgh-go-spew, go-github-com-pmezard-go-difflib,
and go-github-com-stretchr-testify-bootstrap.

Change-Id: I058fa393952dc73d73ac7ab48af4d29665828495
---
 gnu/packages/golang.scm | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 77d9a4f065..739376302d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3196,7 +3196,7 @@ (define-public gopls
 (define-public go-github-com-stretchr-objx
   (package
     (name "go-github-com-stretchr-objx")
-    (version "0.4.0")
+    (version "0.5.2")
     (source
      (origin
        (method git-fetch)
@@ -3206,11 +3206,7 @@ (define-public go-github-com-stretchr-objx
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0dygds32qxx6x1x2mmn7msyjr15qi5r70pyzv8dz8cprxq32nzc1"))
-        (modules '((guix build utils)))
-        (snippet
-         '(begin
-            (delete-file-recursively "vendor")))))
+         "1jcxpfgfpk82lryjkhbd5dy7xzx08d7b9dvbx4bpkmjvn6p339jl"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -3223,11 +3219,12 @@ (define-public go-github-com-stretchr-objx
                  ;; The tests fail when run with gccgo.
                  (false-if-exception (search-input-file inputs "/bin/gccgo"))
                  (apply (assoc-ref %standard-phases 'check) args)))))))
-    (propagated-inputs
+    (native-inputs
+     ;; go-spew and go-difflib are to cover testify-bootstrap and not required
+     ;; for odjx itself.
      (list go-github-com-davecgh-go-spew
-           go-github-com-pmezard-go-difflib))
-    (inputs
-     (list go-github-com-stretchr-testify-bootstrap))
+           go-github-com-pmezard-go-difflib
+           go-github-com-stretchr-testify-bootstrap))
     (home-page "https://github.com/stretchr/objx")
     (synopsis "Go package for dealing with maps, slices, JSON and other data")
     (description "This package provides a Go library for dealing with maps,
-- 
cgit v1.2.3


From ca88519403621879c59211eb4b25c76a2a6f0fc0 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 14 Aug 2024 23:57:34 +0100
Subject: gnu: go-github-com-stretchr-objx: Move to golang-xyz.

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

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

(limited to 'gnu/packages/golang.scm')

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 5638eea5fd..c0ead7d512 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -5260,6 +5260,44 @@ (define-public go-github-com-stathat-go
       (home-page "https://github.com/stathat/go")
       (license license:expat))))
 
+(define-public go-github-com-stretchr-objx
+  (package
+    (name "go-github-com-stretchr-objx")
+    (version "0.5.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/stretchr/objx")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1jcxpfgfpk82lryjkhbd5dy7xzx08d7b9dvbx4bpkmjvn6p339jl"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/stretchr/objx"
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'check
+            (lambda* (#:key inputs #:allow-other-keys #:rest args)
+              (unless
+                  ;; The tests fail when run with gccgo.
+                  (false-if-exception (search-input-file inputs "/bin/gccgo"))
+                (apply (assoc-ref %standard-phases 'check) args)))))))
+    (native-inputs
+     ;; go-spew and go-difflib are to cover testify-bootstrap and not required
+     ;; for odjx itself.
+     (list go-github-com-davecgh-go-spew
+           go-github-com-pmezard-go-difflib
+           go-github-com-stretchr-testify-bootstrap))
+    (home-page "https://github.com/stretchr/objx")
+    (synopsis "Go package for dealing with maps, slices, JSON and other data")
+    (description
+     "This package provides a Go library for dealing with maps,
+slices, JSON and other data.")
+    (license license:expat)))
+
 (define-public go-github-com-syndtr-goleveldb
   (package
     (name "go-github-com-syndtr-goleveldb")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 739376302d..c776f78609 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3193,44 +3193,6 @@ (define-public gopls
 editor.")
     (license license:bsd-3)))
 
-(define-public go-github-com-stretchr-objx
-  (package
-    (name "go-github-com-stretchr-objx")
-    (version "0.5.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/stretchr/objx")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1jcxpfgfpk82lryjkhbd5dy7xzx08d7b9dvbx4bpkmjvn6p339jl"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-       #:import-path "github.com/stretchr/objx"
-       #:phases
-       #~(modify-phases %standard-phases
-           (replace 'check
-             (lambda* (#:key inputs #:allow-other-keys #:rest args)
-               (unless
-                 ;; The tests fail when run with gccgo.
-                 (false-if-exception (search-input-file inputs "/bin/gccgo"))
-                 (apply (assoc-ref %standard-phases 'check) args)))))))
-    (native-inputs
-     ;; go-spew and go-difflib are to cover testify-bootstrap and not required
-     ;; for odjx itself.
-     (list go-github-com-davecgh-go-spew
-           go-github-com-pmezard-go-difflib
-           go-github-com-stretchr-testify-bootstrap))
-    (home-page "https://github.com/stretchr/objx")
-    (synopsis "Go package for dealing with maps, slices, JSON and other data")
-    (description "This package provides a Go library for dealing with maps,
-slices, JSON and other data.")
-    (license license:expat)))
-
 (define-public go-github-com-tevino-abool
   (let ((commit
           "3c25f2fe7cd0ef3eabefce1d90efd69a65d35b12")
-- 
cgit v1.2.3