From 0bd0a2d16de314a93dbf2b3b0a7fb8fd8905a645 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Tue, 2 Jul 2024 22:00:14 +0100
Subject: gnu: go-github-com-yuin-goldmark: Update to 1.7.4.

* gnu/packages/golang-build.scm (go-github-com-yuin-goldmark): Update to 1.7.4.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 086dbaeb17..d0a8971870 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -58,7 +58,7 @@ (define-module (gnu packages golang-build)
 (define-public go-github-com-yuin-goldmark
   (package
     (name "go-github-com-yuin-goldmark")
-    (version "1.2.1")
+    (version "1.7.4")
     (source
      (origin
        (method git-fetch)
@@ -67,7 +67,7 @@ (define-public go-github-com-yuin-goldmark
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "12rsnsf65drcp0jfw2jl9w589vsn3pxdk1zh3v9q908iigngrcmy"))))
+        (base32 "01807xs8501cyhkrrgg6k9ghl9jrw6dp0ry9knygck48canckxs2"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/yuin/goldmark"))
-- 
cgit v1.2.3


From 1edca36f334b081a10bfb30d043c951c9bb6ab18 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 3 Jul 2024 09:18:44 +0100
Subject: gnu: go-github-com-yuin-goldmark: Enable all tests.

* gnu/packages/golang-build.scm (go-github-com-yuin-goldmark)
[arguments]: <#:phases>: Use custom 'check phase.
[description]: Start from the new line.

Change-Id: I81c2c17c91460c77de385c38d9a3c3311656925a
---
 gnu/packages/golang-build.scm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index d0a8971870..b7e7b6f14f 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -70,10 +70,21 @@ (define-public go-github-com-yuin-goldmark
         (base32 "01807xs8501cyhkrrgg6k9ghl9jrw6dp0ry9knygck48canckxs2"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "github.com/yuin/goldmark"))
+     (list
+      #:import-path "github.com/yuin/goldmark"
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; XXX: Workaround for go-build-system's lack of Go modules
+          ;; support.
+          (replace 'check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion (string-append "src/" import-path)
+                  (invoke "go" "test" "-v" "./..."))))))))
     (home-page "https://github.com/yuin/goldmark/")
     (synopsis "Markdown parser")
-    (description "This package provides a markdown parser.")
+    (description
+     "This package provides a markdown parser.")
     (license license:expat)))
 
 (define-public go-golang-org-x-crypto
-- 
cgit v1.2.3


From 8f70fb90a24096499ecd7077ff9a29497bb4e6cc Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 3 Jul 2024 09:25:32 +0100
Subject: gnu: packages/golang: Set default go version to 1.21.

Golang versions 1.17 (02 Aug 2022), 1.18 (01 Feb 2023), 1.19 (06 Sep
2023) and 1.20 (06 Feb 2024) are EOL <https://endoflife.date/go>.

These changes set preferable default version to the minimal currently
maintained one e.g. 1.21

* gnu/packages/golang.scm (go): Set default to go-1.21, add annotation
for the future maintenance.

Remove field <#:go> setting Golang version to go-1.18, go-1.19, 1.20 and
1.21:
* gnu/packages/admin.scm
* gnu/packages/configuration-management.scm
* gnu/packages/databases.scm
* gnu/packages/disk.scm
* gnu/packages/education.scm
* gnu/packages/file-systems.scm
* gnu/packages/finance.scm
* gnu/packages/golang-check.scm
* gnu/packages/golang-crypto.scm
* gnu/packages/golang-web.scm
* gnu/packages/golang-xyz.scm
* gnu/packages/golang.scm
* gnu/packages/high-availability.scm
* gnu/packages/ipfs.scm
* gnu/packages/irc.scm
* gnu/packages/messaging.scm
* gnu/packages/networking.scm
* gnu/packages/syncthing.scm
* gnu/packages/textutils.scm
* gnu/packages/time.scm
* gnu/packages/version-control.scm
* gnu/packages/video.scm

Change-Id: Ieba6a5d7a18423f838d14c02ad55a2ba9c8559eb
---
 gnu/packages/admin.scm                    |  1 -
 gnu/packages/configuration-management.scm |  1 -
 gnu/packages/databases.scm                |  1 -
 gnu/packages/disk.scm                     |  1 -
 gnu/packages/education.scm                |  1 -
 gnu/packages/file-systems.scm             |  1 -
 gnu/packages/finance.scm                  |  4 +--
 gnu/packages/golang-check.scm             | 30 +++++---------------
 gnu/packages/golang-crypto.scm            |  8 ++----
 gnu/packages/golang-web.scm               | 23 ++-------------
 gnu/packages/golang-xyz.scm               | 47 +++----------------------------
 gnu/packages/golang.scm                   | 21 ++++++--------
 gnu/packages/high-availability.scm        |  1 -
 gnu/packages/ipfs.scm                     | 11 --------
 gnu/packages/irc.scm                      |  1 -
 gnu/packages/messaging.scm                |  1 -
 gnu/packages/networking.scm               |  5 +---
 gnu/packages/syncthing.scm                |  1 -
 gnu/packages/textutils.scm                |  1 -
 gnu/packages/time.scm                     |  1 -
 gnu/packages/version-control.scm          |  1 -
 gnu/packages/video.scm                    |  3 +-
 22 files changed, 26 insertions(+), 139 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index f0aa6adc85..b598a2b6af 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -6147,7 +6147,6 @@ (define-public doctl
     (arguments
      (list #:import-path "github.com/digitalocean/doctl/cmd/doctl"
            #:unpack-path "github.com/digitalocean/doctl"
-           #:go go-1.19
            #:build-flags
            #~(list (string-append "-ldflags=-X github.com/digitalocean/doctl.Label=release"
                                   " -X github.com/digitalocean/doctl.Major="
diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index 818a80b94e..5a67de919f 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -48,7 +48,6 @@ (define-public chezmoi
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/twpayne/chezmoi"
       #:install-source? #f
       #:phases
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index e6fabaa223..7ca8e9f16e 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -5503,7 +5503,6 @@ (define-public sqls
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:install-source? #f
       #:import-path "github.com/lighttiger2505/sqls"))
     (native-inputs
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index 9b161182e4..ee76647475 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -1308,7 +1308,6 @@ (define-public lf
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.18
       #:install-source? #f
       #:import-path "github.com/gokcehan/lf"))
     (native-inputs
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 4e809f1098..ba86f1a96d 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -114,7 +114,6 @@ (define-public cf-tool
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.18
       #:install-source? #f
       #:import-path "github.com/xalanq/cf-tool"
       #:phases
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index fa7da35898..707937b78c 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -1956,7 +1956,6 @@ (define-public tmsu
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/oniony/TMSU"
       #:unpack-path "github.com/oniony/TMSU"
       #:install-source? #f
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 82c746a526..3505364c00 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1690,9 +1690,7 @@ (define-public trezord
        (file-name (git-file-name name version))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "github.com/trezor/trezord-go"
-       ;; Requires go 1.18 or later: https://github.com/trezor/trezord-go/commit/f559ee5079679aeb5f897c65318d3310f78223ca
-       #:go ,go-1.20))
+     `(#:import-path "github.com/trezor/trezord-go"))
     (native-inputs
      (list go-github-com-gorilla-csrf
            go-github-com-gorilla-handlers
diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 328d0796a3..3dce518511 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -78,7 +78,6 @@ (define-public go-atomicgo-dev-assert
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "atomicgo.dev/assert"))
     (home-page "https://atomicgo.dev/assert")
     (synopsis "Go package with tons of assertions")
@@ -104,8 +103,8 @@ (define-public go-github-com-alecthomas-assert-v2
         (base32 "05jak1v9s2wrwrn6ar0s4388f7qg15q0qfmhfcswgl88720196z3"))))
     (build-system go-build-system)
     (arguments
-     (list #:go go-1.18
-           #:import-path "github.com/alecthomas/assert/v2"))
+     (list
+      #:import-path "github.com/alecthomas/assert/v2"))
     (propagated-inputs
      (list go-github-com-alecthomas-repr
            go-github-com-hexops-gotextdiff))
@@ -620,7 +619,6 @@ (define-public go-github-com-marvinjwendt-testza
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/MarvinJWendt/testza"
       #:phases
       #~(modify-phases %standard-phases
@@ -696,7 +694,6 @@ (define-public go-github-com-onsi-ginkgo-v2
         (base32 "1w5dldjjcz2kpyxml4zd9yah7galfpmhcpc2l4zc5pr3skpwpibv"))))
     (arguments
      (list
-      #:go go-1.20
       #:import-path "github.com/onsi/ginkgo/v2"))
     (propagated-inputs
      (list go-github-com-go-logr-logr
@@ -726,7 +723,6 @@ (define-public go-github-com-onsi-gomega
       ;; Unless we disable the tests, we have a circular dependency on
       ;; ginkgo/v2.
       #:tests? #f
-      #:go go-1.21
       #:import-path "github.com/onsi/gomega"))
     (propagated-inputs
      (list go-github-com-golang-protobuf
@@ -758,7 +754,6 @@ (define-public go-github-com-otiai10-mint
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/otiai10/mint"))
     (home-page "https://github.com/otiai10/mint")
     (synopsis "Minimal assertion for Golang testing framework")
@@ -1229,7 +1224,6 @@ (define-public go-github-com-warpfork-go-testmark
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/warpfork/go-testmark"))
     (home-page "https://github.com/warpfork/go-testmark")
     (synopsis "Parser for @code{testmark} format")
@@ -1258,7 +1252,6 @@ (define-public go-github-com-warpfork-go-wish
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/warpfork/go-wish"))
     (home-page "https://github.com/warpfork/go-wish")
     (synopsis "Test assertions for Golang")
@@ -1314,7 +1307,6 @@ (define-public go-go-uber-org-mock
       ;; XXX: The project contains subdirectory which complicate it's testing
       ;; and it does not produce any binary.
       #:tests? #f
-      #:go go-1.20
       #:import-path "go.uber.org/mock"
       #:phases
       #~(modify-phases %standard-phases
@@ -1377,7 +1369,6 @@ (define-public go-pgregory-net-rapid
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.18
       #:import-path "pgregory.net/rapid"))
     (home-page "https://pgregory.net/rapid/")
     (synopsis "Go property-based testing library")
@@ -1410,7 +1401,6 @@ (define-public go-ginkgo
     (name "ginkgo")
     (arguments
      (list
-       #:go go-1.20
        #:import-path "github.com/onsi/ginkgo/ginkgo"
        #:unpack-path "github.com/onsi/ginkgo"
        #:install-source? #f))
@@ -1424,8 +1414,7 @@ (define-public go-keyify
     (inherit go-honnef-co-go-tools)
     (name "go-keyify")
     (arguments
-     `(#:go ,go-1.20
-       #:import-path "honnef.co/go/tools/cmd/keyify"
+     `(#:import-path "honnef.co/go/tools/cmd/keyify"
        #:unpack-path "honnef.co/go/tools"
        #:install-source? #f))
     (synopsis "Transform an unkeyed struct literal into a keyed one in Go")
@@ -1439,7 +1428,6 @@ (define-public go-pprof
     (arguments
      (list
       #:install-source? #f
-      #:go go-1.19
       #:import-path "github.com/google/pprof"))
     (description
      (string-append (package-description go-github-com-google-pprof)
@@ -1451,8 +1439,7 @@ (define-public go-staticcheck
     (inherit go-honnef-co-go-tools)
     (name "go-staticcheck")
     (arguments
-     `(#:go ,go-1.20
-       #:import-path "honnef.co/go/tools/cmd/staticcheck"
+     `(#:import-path "honnef.co/go/tools/cmd/staticcheck"
        #:unpack-path "honnef.co/go/tools"
        #:install-source? #f))
     (synopsis "Staticcheck advanced Go linter")
@@ -1466,8 +1453,7 @@ (define-public go-structlayout
     (inherit go-honnef-co-go-tools)
     (name "go-structlayout")
     (arguments
-     `(#:go ,go-1.20
-       #:import-path "honnef.co/go/tools/cmd/structlayout"
+     `(#:import-path "honnef.co/go/tools/cmd/structlayout"
        #:unpack-path "honnef.co/go/tools"
        #:install-source? #f))
     (synopsis "Display the layout (field sizes and padding) of structs in Go")
@@ -1481,8 +1467,7 @@ (define-public go-structlayout-optimize
     (inherit go-honnef-co-go-tools)
     (name "go-structlayout-optimize")
     (arguments
-     `(#:go ,go-1.20
-       #:import-path "honnef.co/go/tools/cmd/structlayout-optimize"
+     `(#:import-path "honnef.co/go/tools/cmd/structlayout-optimize"
        #:unpack-path "honnef.co/go/tools"
        #:install-source? #f))
     (synopsis "Reorder struct fields to minimize the amount of padding in Go")
@@ -1495,8 +1480,7 @@ (define-public go-structlayout-pretty
     (inherit go-honnef-co-go-tools)
     (name "go-structlayout-pretty")
     (arguments
-     `(#:go ,go-1.20
-       #:import-path "honnef.co/go/tools/cmd/structlayout-pretty"
+     `(#:import-path "honnef.co/go/tools/cmd/structlayout-pretty"
        #:unpack-path "honnef.co/go/tools"
        #:install-source? #f))
     (synopsis "Format the output of go-structlayout with ASCII art in Go")
diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index c07c58f685..0d04e26479 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -575,7 +575,6 @@ (define-public go-github-com-golang-jwt-jwt-v5
         (base32 "0px12zhdmzqjj5zlcr136rcsilpmi4chiz6arxv49q372j4nhmia"))))
     (arguments
      (list
-      #:go go-1.18
       #:import-path "github.com/golang-jwt/jwt/v5"))))
 
 (define-public go-github-com-google-go-tpm
@@ -973,8 +972,7 @@ (define-public go-github-com-multiformats-go-multihash
         (base32 "0ydh94083888xl2r4d1grzgqf3c818mkmdpj008jkh6h7m56wc4w"))))
     (build-system go-build-system)
     (arguments
-     (list #:go go-1.21
-           #:import-path "github.com/multiformats/go-multihash"
+     (list #:import-path "github.com/multiformats/go-multihash"
            #:phases
            #~(modify-phases %standard-phases
                (add-after 'unpack 'copy-multibase-specs
@@ -1107,8 +1105,7 @@ (define-public go-github-com-quic-go-qtls-go1-20
     (build-system go-build-system)
     (arguments
      (list
-      #:import-path "github.com/quic-go/qtls-go1-20"
-      #:go go-1.20))
+      #:import-path "github.com/quic-go/qtls-go1-20"))
     (propagated-inputs
      (list go-golang-org-x-crypto
            go-golang-org-x-sys))
@@ -1134,7 +1131,6 @@ (define-public go-github-com-refraction-networking-utls
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/refraction-networking/utls"
-       #:go ,go-1.20
        #:tests? #f))                    ;requires internet access
     (propagated-inputs
      (list go-github-com-andybalholm-brotli
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index ac137560b5..e04fc91504 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -206,7 +206,6 @@ (define-public go-github-com-audriusbutkevicius-pfilter
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/AudriusButkevicius/pfilter"
       #:phases
       #~(modify-phases %standard-phases
@@ -561,8 +560,8 @@ (define-public go-github-com-cenkalti-backoff-v4
         (base32 "1pwr7fzxgngb073q98qrz1f90bkk3pljynif6jl5a6q6kcsn7xf1"))))
     (build-system go-build-system)
     (arguments
-     (list #:go go-1.21
-           #:import-path "github.com/cenkalti/backoff/v4"))
+     (list
+      #:import-path "github.com/cenkalti/backoff/v4"))
     (home-page "https://github.com/cenkalti/backoff")
     (synopsis "The exponential backoff algorithm in Go")
     (description "This is a Go port of the exponential backoff algorithm from
@@ -1403,7 +1402,6 @@ (define-public go-github-com-jackpal-gateway
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/jackpal/gateway"))
     (native-inputs
      (list go-github-com-stretchr-testify))
@@ -1758,7 +1756,6 @@ (define-public go-github-com-multiformats-go-multiaddr-0.12
         (base32 "1rn02yn7494r7ayn585bbsddprbn8wdccxs4n2k5dmll4dyd39mp"))))
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/multiformats/go-multiaddr"))
     (native-inputs (list go-github-com-stretchr-testify))
     (propagated-inputs (list go-github-com-ipfs-go-cid
@@ -1783,7 +1780,6 @@ (define-public go-github-com-multiformats-go-multiaddr-dns
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/multiformats/go-multiaddr-dns"
       #:unpack-path "github.com/multiformats/go-multiaddr-dns"))
     (propagated-inputs
@@ -1811,7 +1807,6 @@ (define-public go-github-com-multiformats-go-multiaddr-fmt
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/multiformats/go-multiaddr-fmt"))
     (propagated-inputs
      (list go-github-com-multiformats-go-multiaddr-0.12))
@@ -1875,7 +1870,6 @@ (define-public go-github-com-multiformats-go-multistream
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.20
       #:import-path "github.com/multiformats/go-multistream"))
     (propagated-inputs
      (list go-github-com-multiformats-go-varint))
@@ -1954,7 +1948,6 @@ (define-public go-github-com-oschwald-geoip2-golang
     (arguments
      (list
       #:tests? #f ; Requires some unpackaged software and test data
-      #:go go-1.21
       #:import-path "github.com/oschwald/geoip2-golang"))
     (propagated-inputs
      (list go-github-com-oschwald-maxminddb-golang))
@@ -1981,7 +1974,6 @@ (define-public go-github-com-oschwald-maxminddb-golang
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/oschwald/maxminddb-golang"
       #:phases
       #~(modify-phases %standard-phases
@@ -2059,7 +2051,6 @@ (define-public go-github-com-pion-dtls-v2
         (base32 "10nn9349f7snqkzncda5m013fgnzicrcxi6pb6ghc0vb6rhqkf30"))))
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/pion/dtls/v2"))
     (native-inputs
      (list go-github-com-stretchr-testify))
@@ -2136,7 +2127,6 @@ (define-public go-github-com-pion-ice-v2
     (arguments
      (list
       #:tests? #f ;Tests require network access.
-      #:go go-1.21
       #:import-path "github.com/pion/ice/v2"))
     (propagated-inputs
      (list go-github-com-google-uuid
@@ -2166,7 +2156,6 @@ (define-public go-github-com-pion-ice-v3
     (arguments
      (list
       #:tests? #f ;Tests require network access.
-      #:go go-1.21
       #:import-path "github.com/pion/ice/v3"))
     (propagated-inputs
      (list go-github-com-google-uuid
@@ -2199,7 +2188,6 @@ (define-public go-github-com-pion-mdns
       ;; packaging, see
       ;; <https://github.com/pion/.goassets/blob/master/.github/workflows/test.reusable.yml>.
       #:tests? #f
-      #:go go-1.21
       #:unpack-path "github.com/pion/mdns"
       #:import-path "github.com/pion/mdns"))
     (native-inputs
@@ -2253,7 +2241,6 @@ (define-public go-github-com-pion-rtp
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/pion/rtp"))
     (propagated-inputs
      (list go-github-com-pion-randutil))
@@ -2280,7 +2267,6 @@ (define-public go-github-com-pion-stun
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/pion/stun"))
     (native-inputs
      (list go-github-com-stretchr-testify))
@@ -2315,7 +2301,6 @@ (define-public go-github-com-pion-stun-v2
         (base32 "0zli55ls5izpr6cw0wj0gy44872xn9rk20i8ay9cfk7j2rb60y60"))))
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/pion/stun/v2"))
     (propagated-inputs
      (list go-github-com-pion-dtls-v2
@@ -2509,7 +2494,6 @@ (define-public go-github-com-pires-go-proxyproto
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.18
       #:import-path "github.com/pires/go-proxyproto"))
     (home-page "https://github.com/pires/go-proxyproto")
     (synopsis "Implementation of the PROXY protocol")
@@ -2618,7 +2602,6 @@ (define-public go-github-com-quic-go-qpack
      (list
       ;; Tests require ginkgo v2.
       #:tests? #f
-      #:go go-1.20
       #:import-path "github.com/quic-go/qpack"))
     (propagated-inputs
      (list go-github-com-onsi-ginkgo
@@ -2650,7 +2633,6 @@ (define-public go-github-com-quic-go-quic-go
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/quic-go/quic-go"
       #:phases
       #~(modify-phases %standard-phases
@@ -2710,7 +2692,6 @@ (define-public go-github-com-quic-go-webtransport-go
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/quic-go/webtransport-go"))
     (native-inputs
      (list go-go-uber-org-mock
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index eeefefb3f8..bd4f7da876 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -159,7 +159,6 @@ (define-public go-atomicgo-dev-schedule
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.18
       #:import-path "atomicgo.dev/schedule"))
     (home-page "https://atomicgo.dev/schedule")
     (synopsis "Easily schedule non-blocking tasks in Golang")
@@ -186,7 +185,6 @@ (define-public go-bazil-org-fuse
      (list
       ;; Tests require root access to mount file system.
       #:tests? #f
-      #:go go-1.19
       #:import-path "bazil.org/fuse"))
     (propagated-inputs
      (list go-github-com-tv42-httpunix go-golang-org-x-sys))
@@ -217,7 +215,6 @@ (define-public go-code-cloudfoundry-org-bytefmt
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.20
       #:import-path "code.cloudfoundry.org/bytefmt"))
     (native-inputs
      (list go-github-com-onsi-gomega
@@ -274,7 +271,6 @@ (define-public go-git-sr-ht-emersion-go-sqlite3-fts5
     ;; they may be sourced from sqlite package.
     (arguments
      (list
-      #:go go-1.21
       #:import-path "git.sr.ht/~emersion/go-sqlite3-fts5"
       #:phases
       #~(modify-phases %standard-phases
@@ -510,7 +506,6 @@ (define-public go-github-com-alecthomas-chroma-v2
         (base32 "1qgr4gywjks869sc85wb8nby612b8wvsa1dwpsbanjsljq7wq7mp"))))
     (arguments
      (list
-      #:go go-1.19
       #:import-path "github.com/alecthomas/chroma/v2"
       #:phases
       #~(modify-phases %standard-phases
@@ -630,7 +625,6 @@ (define-public go-github-com-alecthomas-kong
      (list
       ;; One test failed when set to go-1.18 o lower, see
       ;; <https://github.com/alecthomas/kong/issues/437>
-      #:go go-1.19
       #:import-path "github.com/alecthomas/kong"))
     (native-inputs
      (list go-github-com-alecthomas-assert-v2))
@@ -658,8 +652,8 @@ (define-public go-github-com-alecthomas-participle-v2
         (base32 "0k2vsd58rgwyylyn5zja6z6k1sg4m39g2fhd88lvja60ca51bh98"))))
     (build-system go-build-system)
     (arguments
-     (list #:go go-1.18
-           #:import-path "github.com/alecthomas/participle/v2"))
+     (list
+      #:import-path "github.com/alecthomas/participle/v2"))
     (native-inputs
      (list go-github-com-alecthomas-assert-v2))
     (home-page "https://github.com/alecthomas/participle")
@@ -687,7 +681,6 @@ (define-public go-github-com-alecthomas-repr
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.18
       #:import-path "github.com/alecthomas/repr"))
     (native-inputs
      (list go-github-com-stretchr-testify))
@@ -842,8 +835,7 @@ (define-public go-github-com-benbjohnson-clock
         (base32 "1p7n09pywqra21l981fbkma9vzsyf31pbvw6xg5r4hp8h8scf955"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "github.com/benbjohnson/clock"
-       #:go ,go-1.21))
+     `(#:import-path "github.com/benbjohnson/clock"))
     (home-page "https://github.com/benbjohnson/clock")
     (synopsis "Small library for mocking time in Go")
     (description
@@ -1306,7 +1298,6 @@ (define-public go-github-com-cskr-pubsub
     (arguments
      (list
       #:tests? #t ; Tests require network interface access
-      #:go go-1.18
       #:import-path "github.com/cskr/pubsub"))
     (home-page "https://github.com/cskr/pubsub")
     (synopsis "Simple pubsub package for go")
@@ -1453,7 +1444,6 @@ (define-public go-github-com-dave-jennifer
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.20
       #:import-path "github.com/dave/jennifer"))
     (home-page "https://github.com/dave/jennifer")
     (synopsis "Code generator for Go")
@@ -1676,8 +1666,7 @@ (define-public go-github-com-dustin-gojson
                       "s := strconv.QuoteRune(rune(c))"))))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "github.com/dustin/gojson"
-       #:go ,go-1.21))
+     `(#:import-path "github.com/dustin/gojson"))
     (home-page "https://github.com/dustin/gojson")
     (synopsis "Extended Golang's @code{encoding/json} module with the public scanner API")
     (description
@@ -1787,7 +1776,6 @@ (define-public go-github-com-expr-lang-expr
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/expr-lang/expr"))
     (home-page "https://expr-lang.org/")
     (synopsis "Expression language and expression evaluation for Go")
@@ -1958,7 +1946,6 @@ (define-public go-github-com-gabriel-vasile-mimetype
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.20
       #:import-path "github.com/gabriel-vasile/mimetype"
       #:phases #~(modify-phases %standard-phases
                    (add-before 'check 'add-supported-mimes-md
@@ -2009,7 +1996,6 @@ (define-public go-github-com-go-logr-logr
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.18
       #:import-path "github.com/go-logr/logr"
       #:phases
       #~(modify-phases %standard-phases
@@ -2125,7 +2111,6 @@ (define-public go-github-com-goccy-go-yaml
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.18
       #:import-path "github.com/goccy/go-yaml"
       #:phases
       #~(modify-phases %standard-phases
@@ -2175,7 +2160,6 @@ (define-public go-github-com-gookit-color
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/gookit/color"
       #:phases
       #~(modify-phases %standard-phases
@@ -2424,7 +2408,6 @@ (define-public go-github-com-hashicorp-golang-lru-v2
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.18
       #:import-path "github.com/hashicorp/golang-lru/v2"))))
 
 (define-public go-github-com-hashicorp-hcl
@@ -2645,7 +2628,6 @@ (define-public go-github-com-jdkato-twine
       ;;     segment_test.go:145: Actual: 2, Expected: 1
       ;;     segment_test.go:146: ===
       #:tests? #f
-      #:go go-1.21
       #:import-path "github.com/jdkato/twine"
       #:phases
       #~(modify-phases %standard-phases
@@ -3044,7 +3026,6 @@ (define-public go-github-com-logrusorgru-aurora-v4
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.19
       #:import-path "github.com/logrusorgru/aurora/v3"))
     (native-inputs
      (list go-github-com-stretchr-testify))))
@@ -3100,7 +3081,6 @@ (define-public go-github-com-masterminds-semver-v3
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/Masterminds/semver/v3"))
     (native-inputs
      (list go-github-com-stretchr-testify-next))
@@ -3343,7 +3323,6 @@ (define-public go-github-com-mattn-go-sqlite3
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.19
       #:import-path "github.com/mattn/go-sqlite3"))
     (home-page "https://github.com/mattn/go-sqlite3")
     (synopsis "Sqlite3 driver for Go")
@@ -3612,7 +3591,6 @@ (define-public go-github-com-msteinert-pam
      (list
       ;; To run the full suite, the tests must be run as the root user.
       #:tests? #f
-      #:go go-1.20
       #:import-path "github.com/msteinert/pam"))
     (propagated-inputs
      (list go-golang-org-x-term
@@ -3710,7 +3688,6 @@ (define-public go-github-com-multiformats-go-multibase
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/multiformats/go-multibase"
       #:phases
       #~(modify-phases %standard-phases
@@ -3750,7 +3727,6 @@ (define-public go-github-com-multiformats-go-multicodec
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.19
       #:import-path "github.com/multiformats/go-multicodec"
       #:phases
       #~(modify-phases %standard-phases
@@ -3809,7 +3785,6 @@ (define-public go-github-com-nats-io-nats-go
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.20
       #:import-path "github.com/nats-io/nats.go"))
     (propagated-inputs (list go-golang-org-x-text
                          go-github-com-nats-io-nuid
@@ -3892,7 +3867,6 @@ (define-public go-github-com-neurosnap-sentences
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/neurosnap/sentences"))
     (home-page "https://github.com/neurosnap/sentences")
     (synopsis "Multilingual command line sentence tokenizer in Golang")
@@ -4042,7 +4016,6 @@ (define-public go-github-com-otiai10-copy
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/otiai10/copy"
       #:phases
       #~(modify-phases %standard-phases
@@ -4214,7 +4187,6 @@ (define-public go-github-com-pterm-pterm
       ;; Cycle: go-github-com-pterm-pterm -> go-github-com-marvinjwendt-testza
       ;; -> go-github-com-pterm-pterm
       #:tests? #f
-      #:go go-1.21
       #:import-path "github.com/pterm/pterm"))
     (propagated-inputs
      (list go-atomicgo-dev-cursor
@@ -4381,7 +4353,6 @@ (define-public go-github-com-shirou-gopsutil
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.18
       #:import-path "github.com/shirou/gopsutil"
       #:phases #~(modify-phases %standard-phases
                    (add-after 'unpack 'remove-v3
@@ -4425,7 +4396,6 @@ (define-public go-github-com-shirou-gopsutil-v3
         (base32 "1xlfcx6giqaxdah2m02q2i8ynwlzar953wr8wqx1j3004xdgaivd"))))
     (arguments
      (list
-      #:go go-1.18
       #:import-path "github.com/shirou/gopsutil"
       #:phases
       #~(modify-phases %standard-phases
@@ -4501,7 +4471,6 @@ (define-public go-github-com-songmu-gitconfig
       ;; Package's tests appear to be hardcoded to the author's gitconfig
       ;; and require network access.
       #:tests? #f
-      #:go go-1.21
       #:import-path "github.com/Songmu/gitconfig"))
     (propagated-inputs
      (list go-github-com-goccy-go-yaml))
@@ -4576,7 +4545,6 @@ (define-public go-github-com-syndtr-goleveldb
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/syndtr/goleveldb"
       #:phases
       #~(modify-phases %standard-phases
@@ -4761,7 +4729,6 @@ (define-public go-github-com-tklauser-go-sysconf
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.18
       #:import-path "github.com/tklauser/go-sysconf"
       #:phases #~(modify-phases %standard-phases
                    (add-before 'check 'remove-failing-tests
@@ -4798,7 +4765,6 @@ (define-public go-github-com-tklauser-numcpus
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.18
       #:import-path "github.com/tklauser/numcpus"
       #:phases #~(modify-phases %standard-phases
                    (add-before 'check 'remove-failing-tests
@@ -5100,7 +5066,6 @@ (define-public go-go-uber-org-dig
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.20
       #:import-path "go.uber.org/dig"))
     (native-inputs
      (list go-github-com-stretchr-testify-next))
@@ -5127,7 +5092,6 @@ (define-public go-go-uber-org-fx
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.20
       #:import-path "go.uber.org/fx"))
     (native-inputs
      (list go-github-com-stretchr-testify-next))
@@ -5186,7 +5150,6 @@ (define-public go-go-uber-org-zap
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.19
       #:import-path "go.uber.org/zap"
       #:phases
       #~(modify-phases %standard-phases
@@ -5318,7 +5281,6 @@ (define-public go-chroma
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.19
       #:install-source? #f
       #:import-path "github.com/alecthomas/chroma/cmd/chroma"))
     (native-inputs
@@ -5357,7 +5319,6 @@ (define-public go-numcpus
     (name "go-numcpus")
     (arguments
      (list
-      #:go go-1.18
       #:import-path "github.com/tklauser/numcpus/cmd/numcpus"
       #:unpack-path "github.com/tklauser/numcpus"
       #:install-source? #f))
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index eed7126873..8b5e0fa747 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -985,7 +985,10 @@ (define-public go-1.22
                     (list go-1.21)
                     (package-native-inputs go-1.21)))))
 
-(define-public go go-1.17)
+;;
+;; Default Golang version used in guix/build-system/go.scm to build packages.
+;;
+(define-public go go-1.21)
 
 (define make-go-std
   (mlambdaq (go)
@@ -2227,7 +2230,6 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports
     (arguments
      `(#:unpack-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird"
        #:import-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird/cmd/lyrebird"
-       #:go ,go-1.20
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'substitutions
@@ -2880,7 +2882,6 @@ (define-public go-github-com-go-playground-validator-v10
                 "0zff0qpqfzwa4xazppiq7jvpncnmx52m23qi4ih754b7rzhbk0iz"))))
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/go-playground/validator/v10"))
     (propagated-inputs
      (modify-inputs (package-propagated-inputs
@@ -3168,7 +3169,6 @@ (define-public govulncheck
     (build-system go-build-system)
     (arguments
      `(#:import-path "golang.org/x/vuln"
-       #:go ,go-1.19
        #:install-source? #f
        #:phases ,#~(modify-phases %standard-phases
                      (add-after 'unpack 'remove-go-mod-tidy
@@ -6277,8 +6277,7 @@ (define-public go-google-golang-org-protobuf
                 "1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0"))))
     (build-system go-build-system)
     (arguments
-     (list #:go go-1.21
-           #:import-path "google.golang.org/protobuf"
+     (list #:import-path "google.golang.org/protobuf"
            #:phases
            #~(modify-phases %standard-phases
                ;; XXX: Workaround for go-build-system's lack of Go modules
@@ -8043,8 +8042,7 @@ (define-public gofumpt
                              fixed-version))))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "mvdan.cc/gofumpt"
-       #:go ,go-1.19))
+     `(#:import-path "mvdan.cc/gofumpt"))
     (native-inputs (list go-gopkg-in-errgo-fmt-errors))
     (propagated-inputs (list go-github-com-pkg-diff
                              go-github-com-kr-text
@@ -8093,8 +8091,7 @@ (define-public unparam
                 "0wynf0b32azxljncw5fh9bwkxpdflvf9q1z16wyj432566yjh12c"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "mvdan.cc/unparam"
-       #:go ,go-1.19))
+     `(#:import-path "mvdan.cc/unparam"))
     (inputs (list go-golang-org-x-sys go-golang-org-x-mod
                   go-github-com-pkg-diff go-golang-org-x-tools
                   go-github-com-rogpeppe-go-internal))
@@ -8479,7 +8476,6 @@ (define-public go-github-com-arceliar-ironwood
     (build-system go-build-system)
     (arguments
      (list #:import-path "github.com/Arceliar/ironwood"
-           #:go go-1.21
            #:tests? #f
            #:phases
            #~(modify-phases %standard-phases
@@ -8888,8 +8884,7 @@ (define-public go-github-com-peterbourgon-diskv
         (base32 "0pdy8f7bkm65gx4vknwcvfa619hknflqxkdlvmf427k2mzm91gmh"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "github.com/peterbourgon/diskv"
-       #:go ,go-1.18))
+     `(#:import-path "github.com/peterbourgon/diskv"))
     (propagated-inputs (list go-github-com-google-btree))
     (home-page "https://github.com/peterbourgon/diskv")
     (synopsis "Disk-backed key-value store")
diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm
index c629385310..89d3e22c7e 100644
--- a/gnu/packages/high-availability.scm
+++ b/gnu/packages/high-availability.scm
@@ -226,7 +226,6 @@ (define-public nats-server
            go-golang-org-x-time))
     (arguments
      (list
-      #:go go-1.20
       #:import-path "github.com/nats-io/nats-server"
       #:install-source? #f))
     (home-page "https://github.com/nats-io/nats-server")
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index daf68903c2..078d50c5d8 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -56,7 +56,6 @@ (define-public go-github-com-ipfs-go-block-format
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/ipfs/go-block-format"))
     (propagated-inputs
      (list go-github-com-multiformats-go-multihash
@@ -88,7 +87,6 @@ (define-public go-github-com-ipfs-go-cid
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/ipfs/go-cid"))
     (propagated-inputs
      (list go-github-com-multiformats-go-multihash
@@ -117,7 +115,6 @@ (define-public go-github-com-ipfs-go-cidutil
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/ipfs/go-cidutil"))
     (propagated-inputs
      (list go-github-com-ipfs-go-cid
@@ -237,7 +234,6 @@ (define-public go-github-com-ipfs-go-detect-race
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/ipfs/go-detect-race"))
     (home-page "https://github.com/ipfs/go-detect-race")
     (synopsis "Detect if compiled with race")
@@ -262,7 +258,6 @@ (define-public go-github-com-ipfs-go-ipfs-util
                              go-github-com-multiformats-go-multihash))
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/ipfs/go-ipfs-util"))
     (home-page "https://github.com/ipfs/go-ipfs-util")
     (synopsis "Common utilities used by @code{go-ipfs} and related packages")
@@ -286,7 +281,6 @@ (define-public go-github-com-ipfs-go-ipld-cbor
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/ipfs/go-ipld-cbor"))
     (propagated-inputs
      (list go-github-com-ipfs-go-block-format
@@ -360,7 +354,6 @@ (define-public go-github-com-ipfs-go-ipld-format
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/ipfs/go-ipld-format"))
     (propagated-inputs
      (list go-github-com-multiformats-go-multihash
@@ -389,7 +382,6 @@ (define-public go-github-com-ipld-go-ipld-prime
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:unpack-path "github.com/ipld/go-ipld-prime/"
       #:import-path "github.com/ipld/go-ipld-prime/"
       #:phases
@@ -489,7 +481,6 @@ (define-public go-github-com-ipfs-go-log-v2
            go-go-uber-org-zap))
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/ipfs/go-log/v2"))
     (home-page "https://github.com/ipfs/go-log")
     (synopsis "Logging library used by @code{go-ipfs}")
@@ -520,7 +511,6 @@ (define-public go-github-com-ipfs-go-log
            go-go-uber-org-zap))
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/ipfs/go-log"))))
 
 (define-public go-github-com-whyrusleeping-cbor-gen
@@ -753,7 +743,6 @@ (define-public kubo
      (list
       #:unpack-path "github.com/ipfs/kubo"
       #:import-path "github.com/ipfs/kubo/cmd/ipfs"
-      #:go go-1.21
       #:phases
       #~(modify-phases %standard-phases
           ;; https://github.com/ipfs/kubo/blob/master/docs/command-completion.md
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 72e91503c1..eecb8812e4 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -1108,7 +1108,6 @@ (define-public soju
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.19
       #:install-source? #f
       #:import-path "git.sr.ht/~emersion/soju"
       #:phases
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 0278653faf..bf4e2f078c 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -3306,7 +3306,6 @@ (define-public matterbridge
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.21
       #:import-path "github.com/42wim/matterbridge"))
     (synopsis "Bridge together various messaging networks and protocols")
     (description
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index c94f772b74..54d5f16f21 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -4627,7 +4627,6 @@ (define-public yggdrasil
            ;; TODO: figure out how tests are run
            #:tests? #f
            #:install-source? #f
-           #:go go-1.21
            #:phases
            #~(modify-phases %standard-phases
                (replace 'build
@@ -4722,7 +4721,6 @@ (define-public nebula
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.20
       #:import-path "github.com/slackhq/nebula"
       #:install-source? #f
       #:phases
@@ -4828,8 +4826,7 @@ (define-public phantomsocks
                 "1kbcr6580a9pi0a3wssnfr3mnxqq2k9w1fg4khikn82lqaljab2f"))))
     (build-system go-build-system)
     (arguments
-     (list #:go go-1.21
-           #:install-source? #f
+     (list #:install-source? #f
            #:import-path "github.com/macronut/phantomsocks"
            #:build-flags #~'("-tags" #$(if (target-linux?)
                                            "rawsocket"
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index ea8249869d..47cbb7ee74 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -66,7 +66,6 @@ (define-public syncthing
      (list #:modules '((srfi srfi-26) ; for cut
                        (guix build utils)
                        (guix build go-build-system))
-           #:go go-1.20
            #:import-path "github.com/syncthing/syncthing"
            ;; We don't need to install the source code for end-user applications.
            #:install-source? #f
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 0d704faed9..5510383d0c 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1581,7 +1581,6 @@ (define-public miller
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.19
       #:install-source? #f
       #:import-path "github.com/johnkerl/miller/cmd/mlr"
       #:unpack-path "github.com/johnkerl/miller"
diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm
index 2612201c11..27cea548ec 100644
--- a/gnu/packages/time.scm
+++ b/gnu/packages/time.scm
@@ -644,7 +644,6 @@ (define-public tz
     (build-system go-build-system)
     (arguments
      (list
-      #:go go-1.17
       #:install-source? #f
       #:import-path "github.com/oz/tz"))
     (inputs
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 29401f87ff..f2898b519a 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3825,7 +3825,6 @@ (define-public ghq
     (arguments
      (list
       #:install-source? #f
-      #:go go-1.21
       #:import-path "github.com/x-motemen/ghq"
       #:phases
       #~(modify-phases %standard-phases
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index b6bf9236b2..92d04e7ace 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2984,8 +2984,7 @@ (define-public orfondl
                           (delete-file "orfondl")))))
     (build-system go-build-system)
     (arguments
-     (list #:go go-1.19
-           #:install-source? #f
+     (list #:install-source? #f
            #:import-path "github.com/badlogic/orfondl"
            #:phases
            #~(modify-phases %standard-phases
-- 
cgit v1.2.3


From 06e94114a458d0cffdc00e9789320dceb47ac24d Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 3 Jul 2024 12:59:09 +0100
Subject: gnu: go-golang-org-x-exp: Update to
 0.0.0-20240613232115-7f521ea00fb8.

* gnu/packages/golang-build.scm (go-golang-org-x-exp): Update to 0.0.0-20240613232115-7f521ea00fb8.

Change-Id: I0317b402ec8b5c0cd9b519725b3fdcc07126feac
---
 gnu/packages/golang-build.scm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index b7e7b6f14f..1b966fd94e 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -124,7 +124,7 @@ (define-public go-golang-org-x-crypto
 (define-public go-golang-org-x-exp
   (package
     (name "go-golang-org-x-exp")
-    (version "0.0.0-20221004215720-b9f4876ce741")
+    (version "0.0.0-20240613232115-7f521ea00fb8")
     (source
      (origin
        (method git-fetch)
@@ -133,7 +133,20 @@ (define-public go-golang-org-x-exp
              (commit (go-version->git-ref version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "030b929xyg8dpp6f4qbyg63msi6zgzj9sqmvnyphfcrjkqf7nr41"))))
+        (base32 "0ccjgv19w5p9sbcq12czmfnkjwv3b7hfljifwax6r9wk4dx0fcn7"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Submodules with their own go.mod files and packed as separated
+           ;; packages:
+           ;;
+           ;; - golang.org/x/exp/event
+           ;; - golang.org/x/exp/jsonrpc2
+           ;; - golang.org/x/exp/shiny
+           ;; - golang.org/x/exp/sumbdb
+           ;; - golang.org/x/exp/typeparams
+           (for-each delete-file-recursively
+                     (list "event" "jsonrpc2" "shiny" "sumdb" "typeparams"))))))
     (build-system go-build-system)
     (arguments
      '(#:import-path "golang.org/x/exp"
-- 
cgit v1.2.3


From eefd68e0ee3f26f305b1a77c6f9871fff7b85654 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 3 Jul 2024 13:57:45 +0100
Subject: gnu: Remove go-golang-org-x-exp-2023.

* gnu/packages/golang-build.scm (go-golang-org-x-exp-2023): Delete variable.
* gnu/packages/golang-web.scm (go-github-com-multiformats-go-multiaddr-0.12):
[propagated-inputs]: Remove go-golang-org-x-exp-2023; add go-golang-org-x-exp.
* gnu/packages/ipfs.scm (kubo):
[inputs]: Remove go-golang-org-x-exp-2023; add go-golang-org-x-exp.

Change-Id: I6d8984114f9aab5369f443e71838f93228a645e9
---
 gnu/packages/golang-build.scm | 16 ----------------
 gnu/packages/golang-web.scm   |  2 +-
 gnu/packages/ipfs.scm         |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 1b966fd94e..45bad64c4b 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -160,22 +160,6 @@ (define-public go-golang-org-x-exp
 @code{old} directory) packages.")
     (license license:bsd-3)))
 
-;; It's for the Kubo update; remove it when it is no longer needed.
-(define-public go-golang-org-x-exp-2023
-  (package
-    (inherit go-golang-org-x-exp)
-    (name "go-golang-org-x-exp")
-    (version "0.0.0-20230725012225-302865e7556b")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://go.googlesource.com/exp")
-             (commit (go-version->git-ref version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1fkmi0zjwv70n9d9q9bmzch2zvf7xm3d65qh63zll6dljq2lh4b8"))))))
-
 (define-public go-golang-org-x-image
   (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
         (revision "1"))
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index e04fc91504..bc8c23b243 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1762,7 +1762,7 @@ (define-public go-github-com-multiformats-go-multiaddr-0.12
                              go-github-com-multiformats-go-multibase
                              go-github-com-multiformats-go-varint
                              go-github-com-multiformats-go-multihash
-                             go-golang-org-x-exp-2023))))
+                             go-golang-org-x-exp))))
 
 (define-public go-github-com-multiformats-go-multiaddr-dns
   (package
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 078d50c5d8..c4914bbb80 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -845,7 +845,7 @@ (define-public kubo
                   go-go-uber-org-multierr
                   go-go-uber-org-zap
                   go-golang-org-x-crypto
-                  go-golang-org-x-exp-2023
+                  go-golang-org-x-exp
                   go-golang-org-x-mod
                   go-golang-org-x-sync
                   go-golang-org-x-sys
-- 
cgit v1.2.3


From 2156dc644b3a1c3ed4df1785d52e325306ef2c9e Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 14:43:53 +0100
Subject: gnu: Add go-golang-org-x-exp-typeparams.

* gnu/packages/golang-build.scm (go-golang-org-x-exp-typeparams): New variable.

Change-Id: I59e68dbf6492b35916dca6da84bc4216454b3f79
---
 gnu/packages/golang-build.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 45bad64c4b..ea7d73dafa 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -160,6 +160,40 @@ (define-public go-golang-org-x-exp
 @code{old} directory) packages.")
     (license license:bsd-3)))
 
+(define-public go-golang-org-x-exp-typeparams
+  (package
+    (name "go-golang-org-x-exp-typeparams")
+    (version "0.0.0-20240707233637-46b078467d37")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/exp")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "17pwikql9x1bm5ci0kk4mlad7smkph0cgq1pi2b43gnhjz8m96l0"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "golang.org/x/exp/typeparams"
+      #:unpack-path "golang.org/x/exp"))
+    (home-page "https://pkg.go.dev/golang.org/x/exp/typeparams")
+    (synopsis "Golang common utilities for writing tools")
+    (description
+     "Package typeparams contains common utilities for writing tools that
+interact with generic Go code, as introduced with Go 1.18.
+
+Many of the types and functions in this package are proxies for the new APIs
+introduced in the standard library with Go 1.18.  For example, the
+typeparams.Union type is an alias for @code{go/types.Union}, and the
+@code{ForTypeSpec} function returns the value of the
+@code{go/ast.TypeSpec.TypeParams} field.  At Go versions older than 1.18 these
+helpers are implemented as stubs, allowing users of this package to write code
+that handles generic constructs inline,even if the Go version being used to
+compile does not support generics.")
+    (license license:bsd-3)))
+
 (define-public go-golang-org-x-image
   (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
         (revision "1"))
-- 
cgit v1.2.3


From 5cbbce16f2e6c0fd0befe5d5141e5d807c908ae0 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 3 Jul 2024 20:21:23 +0100
Subject: gnu: go-golang-org-x-image: Update to 0.18.0.

* gnu/packages/golang-build.scm (go-golang-org-x-image): Update to 0.18.0.

Change-Id: I8b128087f8cdbd181c28cc0b887bc63ef0aa1299
---
 gnu/packages/golang-build.scm | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index ea7d73dafa..34adcf71e7 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -195,21 +195,18 @@ (define-public go-golang-org-x-exp-typeparams
     (license license:bsd-3)))
 
 (define-public go-golang-org-x-image
-  (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
-        (revision "1"))
-    (package
-      (name "go-golang-org-x-image")
-      (version (git-version "0.0.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://go.googlesource.com/image")
-               (commit commit)))
-         (file-name (string-append "go.googlesource.com-image-"
-                                   version "-checkout"))
-         (sha256
-          (base32 "0i2p2girc1sfcic6xs6vrq0fp3szfx057xppksb67kliywjjrm5x"))))
+  (package
+    (name "go-golang-org-x-image")
+    (version "0.18.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/image")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0d7zwdsg06km24vhx6dzk1w26wpi3yhx9jfkf9jnsp5chv5pzlw3"))))
       (build-system go-build-system)
       (arguments
        `(#:import-path "golang.org/x/image"
@@ -222,7 +219,7 @@ (define-public go-golang-org-x-image
       (synopsis "Supplemental Go image libraries")
       (description "This package provides supplemental Go libraries for image
 processing.")
-      (license license:bsd-3))))
+      (license license:bsd-3)))
 
 (define-public go-golang-org-x-mod
   (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
-- 
cgit v1.2.3


From 102069811f466ecea380d1501ad3adf8e51e2c8b Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 3 Jul 2024 20:22:15 +0100
Subject: gnu: go-golang-org-x-image: Fix indentation.

* gnu/packages/golang-build.scm (go-golang-org-x-image): Fix indentation.

Change-Id: I558cf2c2edf918408bb4ff6c8605e27ba6145992
---
 gnu/packages/golang-build.scm | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 34adcf71e7..c1af557f2b 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -207,19 +207,19 @@ (define-public go-golang-org-x-image
        (file-name (git-file-name name version))
        (sha256
         (base32 "0d7zwdsg06km24vhx6dzk1w26wpi3yhx9jfkf9jnsp5chv5pzlw3"))))
-      (build-system go-build-system)
-      (arguments
-       `(#:import-path "golang.org/x/image"
-         ;; Source-only package
-         #:tests? #f
-         #:phases
-         (modify-phases %standard-phases
-           (delete 'build))))
-      (home-page "https://go.googlesource.com/image")
-      (synopsis "Supplemental Go image libraries")
-      (description "This package provides supplemental Go libraries for image
-processing.")
-      (license license:bsd-3)))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "golang.org/x/image"
+       ;; Source-only package
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'build))))
+    (home-page "https://go.googlesource.com/image")
+    (synopsis "Supplemental Go image libraries")
+    (description
+     "This package provides supplemental Go libraries for image processing.")
+    (license license:bsd-3)))
 
 (define-public go-golang-org-x-mod
   (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
-- 
cgit v1.2.3


From b60b7e80fb4f8a729478dc09068228397a31556d Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 3 Jul 2024 21:58:53 +0100
Subject: gnu: go-golang-org-x-image: Enable tests.

* gnu/packages/golang-build.scm (go-golang-org-x-image): Enable tests.
[arguments]: <#:phases>: Add 'remove-examples phase. Use custom 'check phase.
[home-page]: Adjust URL after lint warning.
[propagated-inputs]: Add go-golang-org-x-text.

Change-Id: I51a2bd4e852ab681193b44c330fb988078082c38
---
 gnu/packages/golang-build.scm | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index c1af557f2b..3a919fa05e 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -209,13 +209,32 @@ (define-public go-golang-org-x-image
         (base32 "0d7zwdsg06km24vhx6dzk1w26wpi3yhx9jfkf9jnsp5chv5pzlw3"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "golang.org/x/image"
-       ;; Source-only package
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'build))))
-    (home-page "https://go.googlesource.com/image")
+     (list
+      #:import-path "golang.org/x/image"
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; XXX: go-build-system can't install/build submodules.
+          (delete 'build)
+          (add-after 'unpack 'remove-examples
+            (lambda* (#:key import-path #:allow-other-keys)
+              (delete-file-recursively
+               (string-append "src/" import-path "/example"))))
+          (add-before 'check 'remove-failing-tests
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (for-each delete-file
+                          ;; tiff/reader_test.go:557:14: too many errors
+                          (list "tiff/reader_test.go"
+                                "tiff/writer_test.go")))))
+          ;; XXX: Workaround for go-build-system's lack of Go modules support.
+          (replace 'check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion (string-append "src/" import-path)
+                  (invoke "go" "test" "-v" "./..."))))))))
+    (propagated-inputs
+     (list go-golang-org-x-text))
+    (home-page "https://pkg.go.dev/golang.org/x/image")
     (synopsis "Supplemental Go image libraries")
     (description
      "This package provides supplemental Go libraries for image processing.")
-- 
cgit v1.2.3


From ac2c50685ce2df3c14e67a2ced9cb8123471a836 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 3 Jul 2024 22:03:11 +0100
Subject: gnu: go-golang-org-x-text: Update to 0.16.0.

* gnu/packages/golang-build.scm (go-golang-org-x-text): Update to 0.16.0.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 3a919fa05e..8b2b41da1c 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -426,7 +426,7 @@ (define-public go-golang-org-x-term
 (define-public go-golang-org-x-text
   (package
     (name "go-golang-org-x-text")
-    (version "0.3.2")
+    (version "0.16.0")
     (source
      (origin
        (method git-fetch)
@@ -436,7 +436,7 @@ (define-public go-golang-org-x-text
        (file-name (string-append "go.googlesource.com-text-"
                                  version "-checkout"))
        (sha256
-        (base32 "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"))))
+        (base32 "0pmn0i1xbpwvzl4cdgmjqcsk9vckhqrq6699fnr9mkglh4xj3p7a"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "golang.org/x/text"
-- 
cgit v1.2.3


From c5b72f0d0a8c3b88035695a529584555380da1cc Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Wed, 3 Jul 2024 22:07:25 +0100
Subject: gnu: go-golang-org-x-tools: Update to 0.22.0.

* gnu/packages/golang-build.scm (go-golang-org-x-tools): Update to 0.22.0.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 8b2b41da1c..1f1b0f9e66 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -484,7 +484,7 @@ (define-public go-golang-org-x-time
 (define-public go-golang-org-x-tools
   (package
     (name "go-golang-org-x-tools")
-    (version "0.5.0")
+    (version "0.22.0")
     (source
      (origin
        (method git-fetch)
@@ -493,7 +493,7 @@ (define-public go-golang-org-x-tools
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "08kx2nndq3sr6xai7403mbsqvz5shxmp2icylfr2fmwagr59cb2n"))
+        (base32 "1jn73k6qiwa70cafdmyzczsimwqyzgl9wh9vmdjs96svf5nfzb5a"))
        (modules '((guix build utils)))
        (snippet
         '(begin
-- 
cgit v1.2.3


From c090f335dc95fe65d9a74be461e54f84f3d67bdc Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 13:13:13 +0100
Subject: gnu: go-golang-org-x-mod: Update to 0.19.0.

* gnu/packages/golang-build.scm (go-golang-org-x-mod): Update to 0.19.0.

Change-Id: Iafc4551b0430d65e953d2d3383d6fd3eda839d30
---
 gnu/packages/golang-build.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 1f1b0f9e66..92ff4cd9b9 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -241,20 +241,18 @@ (define-public go-golang-org-x-image
     (license license:bsd-3)))
 
 (define-public go-golang-org-x-mod
-  (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
-        (revision "0"))
     (package
       (name "go-golang-org-x-mod")
-      (version (git-version "0.7.0" revision commit))
+      (version "0.19.0")
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
                (url "https://github.com/golang/mod")
-               (commit commit)))
+               (commit (string-append "v" version))))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "14r24fq3kn84k2y2jvvg8hwpy52a3q429pimrdwl5zwknbr2awmh"))))
+          (base32 "02wilb8q2bp6qhqcrbjxq1pjy3y5k8p11pxlg481609zx4rjiszc"))))
       (build-system go-build-system)
       (arguments
        '(#:import-path "golang.org/x/mod/"
@@ -272,7 +270,7 @@ (define-public go-golang-org-x-mod
 The specific case of loading packages should still be done by invoking the
 @command{go} command, which remains the single point of truth for package
 loading algorithms.")
-      (license license:bsd-3))))
+      (license license:bsd-3)))
 
 (define-public go-golang-org-x-net
   (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
-- 
cgit v1.2.3


From c3327150190f2e678c2d7c35637e4cbf8aed737d Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 13:13:55 +0100
Subject: gnu: go-golang-org-x-mod: Fix indentation.

* gnu/packages/golang-build.scm (go-golang-org-x-mod): Fix indentation.

Change-Id: Ifb8aee1d0a38698155707a89cb02f9c726d03f52
---
 gnu/packages/golang-build.scm | 48 +++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 92ff4cd9b9..d55fe2ac19 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -241,36 +241,36 @@ (define-public go-golang-org-x-image
     (license license:bsd-3)))
 
 (define-public go-golang-org-x-mod
-    (package
-      (name "go-golang-org-x-mod")
-      (version "0.19.0")
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/golang/mod")
-               (commit (string-append "v" version))))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "02wilb8q2bp6qhqcrbjxq1pjy3y5k8p11pxlg481609zx4rjiszc"))))
-      (build-system go-build-system)
-      (arguments
-       '(#:import-path "golang.org/x/mod/"
-         #:tests? #f
-         #:phases (modify-phases %standard-phases
-                    ;; Source-only package
-                    (delete 'build))))
-      (home-page "https://golang.org/x/mod")
-      (synopsis "Tools to work directly with Go module mechanics")
-      (description
-       "This repository holds packages for writing tools that work directly
+  (package
+    (name "go-golang-org-x-mod")
+    (version "0.19.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/golang/mod")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "02wilb8q2bp6qhqcrbjxq1pjy3y5k8p11pxlg481609zx4rjiszc"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "golang.org/x/mod/"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  ;; Source-only package
+                  (delete 'build))))
+    (home-page "https://golang.org/x/mod")
+    (synopsis "Tools to work directly with Go module mechanics")
+    (description
+     "This repository holds packages for writing tools that work directly
 with Go module mechanics.  That is, it is for direct manipulation of Go
 modules themselves.
 
 The specific case of loading packages should still be done by invoking the
 @command{go} command, which remains the single point of truth for package
 loading algorithms.")
-      (license license:bsd-3)))
+    (license license:bsd-3)))
 
 (define-public go-golang-org-x-net
   (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
-- 
cgit v1.2.3


From 4798af971ce9a61841d59dbf5f7b011c79b4c3ec Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 13:31:58 +0100
Subject: gnu: go-golang-org-x-mod: Enable tests.

* gnu/packages/golang-build.scm (go-golang-org-x-mod): Apply new package style.
[source]: Swap URI to <https://go.googlesource.com/mod> as for other
go-golang-org-x-* packages.
[arguments]: <#:phases>: Add 'remove-test-files phase. Use custom 'check
phase.

Change-Id: I806d0beab89047be5fbb181db4b410c1f8df0764
---
 gnu/packages/golang-build.scm | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index d55fe2ac19..8b2d93d72a 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -248,18 +248,36 @@ (define-public go-golang-org-x-mod
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/golang/mod")
+             (url "https://go.googlesource.com/mod")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
         (base32 "02wilb8q2bp6qhqcrbjxq1pjy3y5k8p11pxlg481609zx4rjiszc"))))
     (build-system go-build-system)
     (arguments
-     '(#:import-path "golang.org/x/mod/"
-       #:tests? #f
-       #:phases (modify-phases %standard-phases
-                  ;; Source-only package
-                  (delete 'build))))
+     (list
+      #:import-path "golang.org/x/mod"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-test-files
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (for-each delete-file
+                          (list
+                           ;; Break cycle: go-golang-org-x-mod ->
+                           ;; go-golang-org-x-tools -> go-golang-org-x-mod.
+                           "zip/zip_test.go"
+                           ;; Trying to access
+                           ;; <http://ct.googleapis.com/logs/argon2020/ct/v1/get-sth>.
+                           "sumdb/tlog/ct_test.go")))))
+          ;; XXX: Workaround for go-build-system's lack of Go modules
+          ;; support.
+          (delete 'build)
+          (replace 'check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion (string-append "src/" import-path)
+                  (invoke "go" "test" "-v" "./..."))))))))
     (home-page "https://golang.org/x/mod")
     (synopsis "Tools to work directly with Go module mechanics")
     (description
-- 
cgit v1.2.3


From 4fe70563c53f6dc9d58466660644d90951ef7f08 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 13:35:24 +0100
Subject: gnu: Remove go-golang-org-x-net-0.17.

* gnu/packages/golang-build.scm (go-golang-org-x-net-0.17): Delete variable.

Change-Id: Id8c581b1f89c452b13977a05e68a60666e487429
---
 gnu/packages/golang-build.scm | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 8b2d93d72a..7b327202a5 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -322,25 +322,6 @@ (define-public go-golang-org-x-net
       (description "This package provides supplemental Go networking libraries.")
       (license license:bsd-3))))
 
-;; XXX: Not in use by any other packages, consider to remove or merge with
-;; go-golang-org-x-net.
-(define-public go-golang-org-x-net-0.17
-  (let ((commit "b225e7ca6dde1ef5a5ae5ce922861bda011cfabd")
-        (revision "0"))
-    (package
-      (inherit go-golang-org-x-net)
-      (name "go-golang-org-x-net")
-      (version (git-version "0.17.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://go.googlesource.com/net")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9")))))))
-
 (define-public go-golang-org-x-sync
   (package
     (name "go-golang-org-x-sync")
-- 
cgit v1.2.3


From a7c7d86d4267711ea3e3f28f9e76d09faca2fe77 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 13:36:44 +0100
Subject: gnu: go-golang-org-x-net: Update to 0.27.0.

* gnu/packages/golang-build.scm (go-golang-org-x-net): Update to 0.27.0.

Change-Id: I1a14e1c68368561620a744cbe0d6ed25dc502b5c
---
 gnu/packages/golang-build.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 7b327202a5..374939d507 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -291,20 +291,18 @@ (define-public go-golang-org-x-mod
     (license license:bsd-3)))
 
 (define-public go-golang-org-x-net
-  (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
-        (revision "0"))
     (package
       (name "go-golang-org-x-net")
-      (version (git-version "0.5.0" revision commit))
+      (version "0.27.0")
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
                (url "https://go.googlesource.com/net")
-               (commit commit)))
+               (commit (string-append "v" version))))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "1fidlcn3vcz42v2lc0rpmqh3bz08bcklj6jvnmz2vvgc481ci5hy"))))
+          (base32 "0fc6d968yiv2l67z9jg7ssvas1hd1jniqh4m7mmlay0q5gk4vf8s"))))
       (build-system go-build-system)
       (arguments
        (list
@@ -320,7 +318,7 @@ (define-public go-golang-org-x-net
       (home-page "https://go.googlesource.com/net")
       (synopsis "Go supplemental networking libraries")
       (description "This package provides supplemental Go networking libraries.")
-      (license license:bsd-3))))
+      (license license:bsd-3)))
 
 (define-public go-golang-org-x-sync
   (package
-- 
cgit v1.2.3


From 8aa11899bdb2e09191623c961ac65891935e3598 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 13:36:51 +0100
Subject: gnu: go-golang-org-x-net: Fix indentation.

* gnu/packages/golang-build.scm (go-golang-org-x-net): Fix indentation.

Change-Id: Ie36547fa6163617bc7026321ade335185341d678
---
 gnu/packages/golang-build.scm | 57 ++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 374939d507..df5fa638d3 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -291,34 +291,35 @@ (define-public go-golang-org-x-mod
     (license license:bsd-3)))
 
 (define-public go-golang-org-x-net
-    (package
-      (name "go-golang-org-x-net")
-      (version "0.27.0")
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://go.googlesource.com/net")
-               (commit (string-append "v" version))))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0fc6d968yiv2l67z9jg7ssvas1hd1jniqh4m7mmlay0q5gk4vf8s"))))
-      (build-system go-build-system)
-      (arguments
-       (list
-        #:import-path "golang.org/x/net"
-        ;; Source-only package
-        #:tests? #f
-        #:phases
-        #~(modify-phases %standard-phases
-            ;; Source-only package
-            (delete 'build))))
-      (propagated-inputs
-       (list go-golang-org-x-sys go-golang-org-x-term go-golang-org-x-text))
-      (home-page "https://go.googlesource.com/net")
-      (synopsis "Go supplemental networking libraries")
-      (description "This package provides supplemental Go networking libraries.")
-      (license license:bsd-3)))
+  (package
+    (name "go-golang-org-x-net")
+    (version "0.27.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/net")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0fc6d968yiv2l67z9jg7ssvas1hd1jniqh4m7mmlay0q5gk4vf8s"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "golang.org/x/net"
+      ;; Source-only package
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; Source-only package
+          (delete 'build))))
+    (propagated-inputs
+     (list go-golang-org-x-sys go-golang-org-x-term go-golang-org-x-text))
+    (home-page "https://go.googlesource.com/net")
+    (synopsis "Go supplemental networking libraries")
+    (description
+     "This package provides supplemental Go networking libraries.")
+    (license license:bsd-3)))
 
 (define-public go-golang-org-x-sync
   (package
-- 
cgit v1.2.3


From 6be3cbad1351ff9d3ecd56e7f2372e9c54d4af7c Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 13:44:06 +0100
Subject: gnu: go-golang-org-x-net: Enable tests.

* gnu/packages/golang-build.scm (go-golang-org-x-net): Enable tests.
[arguments]: <#:phases>: Use custom 'check phase.
[propagated-inputs]: Add go-golang-org-x-crypto.

Change-Id: I632cdc7541bde898214aa006434fa96a5050fa62
---
 gnu/packages/golang-build.scm | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index df5fa638d3..200170d9c4 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -307,14 +307,21 @@ (define-public go-golang-org-x-net
     (arguments
      (list
       #:import-path "golang.org/x/net"
-      ;; Source-only package
-      #:tests? #f
       #:phases
       #~(modify-phases %standard-phases
-          ;; Source-only package
-          (delete 'build))))
+          ;; XXX: Workaround for go-build-system's lack of Go modules
+          ;; support.
+          (delete 'build)
+          (replace 'check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion (string-append "src/" import-path)
+                  (invoke "go" "test" "-v" "./..."))))))))
     (propagated-inputs
-     (list go-golang-org-x-sys go-golang-org-x-term go-golang-org-x-text))
+     (list go-golang-org-x-crypto
+           go-golang-org-x-sys
+           go-golang-org-x-term
+           go-golang-org-x-text))
     (home-page "https://go.googlesource.com/net")
     (synopsis "Go supplemental networking libraries")
     (description
-- 
cgit v1.2.3


From c2efdad440d0cb9b7919b49ea0663937691e3132 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 13:47:31 +0100
Subject: gnu: go-golang-org-x-crypto: Update to 0.25.0.

* gnu/packages/golang-build.scm (go-golang-org-x-crypto): Update to 0.25.0.
[propagated-inputs]: Remove go-golang-org-x-net and go-golang-org-x-text.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 200170d9c4..90d13b0ce3 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -90,17 +90,16 @@ (define-public go-github-com-yuin-goldmark
 (define-public go-golang-org-x-crypto
   (package
     (name "go-golang-org-x-crypto")
-    (version "0.14.0")
+    (version "0.25.0")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url "https://go.googlesource.com/crypto")
              (commit (string-append "v" version))))
-       (file-name (string-append "go.googlesource.com-crypto-"
-                                 version "-checkout"))
+       (file-name (git-file-name name version))
        (sha256
-        (base32 "08124qkp0l0blq6rw68llfbf84kp99255q0yvxyv27c05b0wkh66"))))
+        (base32 "1cnglyy3fhvnnynazfdrikkwcxv3rlxamvfxink2z241lncvwkxy"))))
     (build-system go-build-system)
     (arguments
      '(#:import-path "golang.org/x/crypto"
@@ -111,10 +110,7 @@ (define-public go-golang-org-x-crypto
          ;; Source-only package
          (delete 'build))))
     (propagated-inputs
-     (list go-golang-org-x-net
-           go-golang-org-x-sys
-           go-golang-org-x-term
-           go-golang-org-x-text))
+     (list go-golang-org-x-sys go-golang-org-x-term))
     (home-page "https://go.googlesource.com/crypto/")
     (synopsis "Supplementary cryptographic libraries in Go")
     (description "This package provides supplementary cryptographic libraries
-- 
cgit v1.2.3


From 0c7e5c8fe63a218901e51dbce270cb0f6020e8dc Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 14:49:16 +0100
Subject: gnu: go-golang-org-x-crypto: Enable tests.

* gnu/packages/golang-build.scm (go-golang-org-x-crypto): Enable tests.
[arguments]: <#:phases>: Add 'remove-test-files phase. Use custom 'check
phase.

Change-Id: I92864633edc9133c00ea71d1200b42d1bd1c0c8b
---
 gnu/packages/golang-build.scm | 77 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 68 insertions(+), 9 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 90d13b0ce3..55e5309894 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -102,19 +102,78 @@ (define-public go-golang-org-x-crypto
         (base32 "1cnglyy3fhvnnynazfdrikkwcxv3rlxamvfxink2z241lncvwkxy"))))
     (build-system go-build-system)
     (arguments
-     '(#:import-path "golang.org/x/crypto"
-       ;; Source-only package
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         ;; Source-only package
-         (delete 'build))))
+     (list
+      #:import-path "golang.org/x/crypto"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-test-files
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (for-each delete-file
+                          (list
+                           ;; Network access requried: go mod download -json
+                           ;; github.com/google/wycheproof@v0.0.0-20191219022705-2196000605e4.
+                           "internal/wycheproof/aead_test.go"
+                           "internal/wycheproof/aes_cbc_test.go"
+                           "internal/wycheproof/dsa_test.go"
+                           "internal/wycheproof/ecdh_stdlib_test.go"
+                           "internal/wycheproof/ecdh_test.go"
+                           "internal/wycheproof/ecdsa_test.go"
+                           "internal/wycheproof/eddsa_test.go"
+                           "internal/wycheproof/hkdf_test.go"
+                           "internal/wycheproof/hmac_test.go"
+                           "internal/wycheproof/rsa_oaep_decrypt_test.go"
+                           "internal/wycheproof/rsa_pss_test.go"
+                           "internal/wycheproof/rsa_signature_test.go"
+                           "internal/wycheproof/wycheproof_test.go")))))
+          ;; XXX: Workaround for go-build-system's lack of Go modules
+          ;; support.
+          (delete 'build)
+          (replace 'check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion (string-append "src/" import-path)
+                  (invoke "go" "test" "-v"
+                          ;; acme - cycle with go-golang-org-x-net
+                          "./argon2/..."
+                          "./bcrypt/..."
+                          "./blake2b/..."
+                          "./blake2s/..."
+                          "./blowfish/..."
+                          "./bn256/..."
+                          "./cast5/..."
+                          "./chacha20/..."
+                          "./chacha20poly1305/..."
+                          "./cryptobyte/..."
+                          "./curve25519/..."
+                          "./ed25519/..."
+                          "./hkdf/..."
+                          "./internal/..."
+                          "./md4/..."
+                          "./nacl/..."
+                          "./ocsp/..."
+                          "./openpgp/..."
+                          "./otr/..."
+                          "./pbkdf2/..."
+                          "./pkcs12/..."
+                          "./poly1305/..."
+                          "./ripemd160/..."
+                          "./salsa20/..."
+                          "./scrypt/..."
+                          "./sha3/..."
+                          "./ssh/..."
+                          "./tea/..."
+                          "./twofish/..."
+                          "./x509roots/..."
+                          "./xtea/..."
+                          "./xts/..."))))))))
     (propagated-inputs
      (list go-golang-org-x-sys go-golang-org-x-term))
     (home-page "https://go.googlesource.com/crypto/")
     (synopsis "Supplementary cryptographic libraries in Go")
-    (description "This package provides supplementary cryptographic libraries
-for the Go language.")
+    (description
+     "This package provides supplementary cryptographic libraries for the Go
+language.")
     (license license:bsd-3)))
 
 (define-public go-golang-org-x-exp
-- 
cgit v1.2.3


From d44df8d43b34071693865bcac0ede09d7febe2a9 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 14:53:43 +0100
Subject: gnu: go-golang-org-x-sys: Update to 0.22.0.

* gnu/packages/golang-build.scm (go-golang-org-x-sys): Update to 0.22.0.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 55e5309894..6eb8ac52da 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -428,7 +428,7 @@ (define-public go-golang-org-x-sync
 (define-public go-golang-org-x-sys
   (package
     (name "go-golang-org-x-sys")
-    (version "0.21.0")
+    (version "0.22.0")
     (source
      (origin
        (method git-fetch)
@@ -437,7 +437,7 @@ (define-public go-golang-org-x-sys
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "000fcyi863sbmamdn3cwfv3s3z9ls5l34xnjavcbgjs591ghki8y"))))
+        (base32 "0kpl5hk0zbh5bfschnq64yj1cs7v3l9v6bd1rw5crlfd4hg7xawa"))))
     (build-system go-build-system)
     (arguments
      (list
-- 
cgit v1.2.3


From 3fde511b7a2c44d1a40afeb3420a678f37e1c5be Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 14:54:47 +0100
Subject: gnu: go-golang-org-x-term: Update to 0.22.0.

* gnu/packages/golang-build.scm (go-golang-org-x-term): Update to 0.22.0.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 6eb8ac52da..a0f7008bd0 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -461,7 +461,7 @@ (define-public go-golang-org-x-sys
 (define-public go-golang-org-x-term
   (package
     (name "go-golang-org-x-term")
-    (version "0.3.0")
+    (version "0.22.0")
     (source
      (origin
        (method git-fetch)
@@ -470,7 +470,7 @@ (define-public go-golang-org-x-term
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl"))))
+        (base32 "0iqh035y65gfm28xp52pnksh49q3nyaz0zrjjj032rs8hv5py75m"))))
     (build-system go-build-system)
     (arguments '(#:import-path "golang.org/x/term"))
     (propagated-inputs
-- 
cgit v1.2.3


From e0ca0978c8ffdb9e8954a82d7a18945bd359e823 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 15:03:34 +0100
Subject: gnu: go-golang-org-x-text: Enable tests.

* gnu/packages/golang-build.scm (go-golang-org-x-text): Enable tests.
[source]: Adjust FILE-NAME.
[arguments]: <#:phases>: Use custom 'check phase.
[description]: Place on a new line.

Change-Id: I1f72a418d60c92c3663bcc6603e705f8a715370a
---
 gnu/packages/golang-build.scm | 41 ++++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index a0f7008bd0..487dc00ccb 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -491,21 +491,44 @@ (define-public go-golang-org-x-text
        (uri (git-reference
              (url "https://go.googlesource.com/text")
              (commit (string-append "v" version))))
-       (file-name (string-append "go.googlesource.com-text-"
-                                 version "-checkout"))
+       (file-name (git-file-name name version))
        (sha256
         (base32 "0pmn0i1xbpwvzl4cdgmjqcsk9vckhqrq6699fnr9mkglh4xj3p7a"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "golang.org/x/text"
-       ;; Source-only package
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'build))))
+     (list
+      #:import-path "golang.org/x/text"
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; XXX: Workaround for go-build-system's lack of Go modules
+          ;; support.
+          (delete 'build)
+          (replace 'check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion (string-append "src/" import-path)
+                  (invoke "go" "test" "-v"
+                          "./cases/..."
+                          ;; cmd - cycle with go-golang-org-x-tools
+                          "./collate/..."
+                          "./currency/..."
+                          "./date/..."
+                          "./encoding/..."
+                          "./feature/..."
+                          "./internal/..."
+                          "./language/..."
+                          ;; message - cycle with go-golang-org-x-tools
+                          "./number/..."
+                          "./runes/..."
+                          "./search/..."
+                          "./secure/..."
+                          "./transform/..."
+                          "./unicode/..."
+                          "./width/..."))))))))
     (home-page "https://go.googlesource.com/text")
     (synopsis "Supplemental Go text processing libraries")
-    (description "This package provides supplemental Go libraries for text
+    (description
+     "This package provides supplemental Go libraries for text
 processing.")
     (license license:bsd-3)))
 
-- 
cgit v1.2.3


From addabe9736f639f23f1cd626f83509765ae4eea0 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 15:09:13 +0100
Subject: gnu: go-golang-org-x-time: Update to 0.5.0.

* gnu/packages/golang-build.scm (go-golang-org-x-time): Update to 0.5.0.

Change-Id: Ifdeaa507ba710bd63dafe8ddc35b2f5233faffb0
---
 gnu/packages/golang-build.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 487dc00ccb..128660e794 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -533,20 +533,18 @@ (define-public go-golang-org-x-text
     (license license:bsd-3)))
 
 (define-public go-golang-org-x-time
-  (let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef")
-        (revision "2"))
     (package
       (name "go-golang-org-x-time")
-      (version (git-version "0.0.0" revision commit))
+      (version "0.5.0")
       (source
        (origin
          (method git-fetch)
          (uri (git-reference
                (url "https://go.googlesource.com/time")
-               (commit commit)))
+               (commit (string-append "v" version))))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"))))
+          (base32 "1dahq0p6zn2pd408q6hsv1jl12nqrwd1gkl3r3dysk2q0z16192v"))))
       (build-system go-build-system)
       (arguments
        `(#:import-path "golang.org/x/time"
@@ -560,7 +558,7 @@ (define-public go-golang-org-x-time
       (synopsis "Supplemental Go time libraries")
       (description "This package provides supplemental Go libraries related to
 time.")
-      (license license:bsd-3))))
+      (license license:bsd-3)))
 
 (define-public go-golang-org-x-tools
   (package
-- 
cgit v1.2.3


From b8aab45d78b6313b662f6d05f06b2c82e118959c Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 15:09:29 +0100
Subject: gnu: go-golang-org-x-time: Fix indentation.

* gnu/packages/golang-build.scm (go-golang-org-x-time): Fix indentation.

Change-Id: I144f91a9acde9605a067f61f09606f313f9b21c2
---
 gnu/packages/golang-build.scm | 49 ++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 128660e794..309c56c06a 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -533,32 +533,33 @@ (define-public go-golang-org-x-text
     (license license:bsd-3)))
 
 (define-public go-golang-org-x-time
-    (package
-      (name "go-golang-org-x-time")
-      (version "0.5.0")
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://go.googlesource.com/time")
-               (commit (string-append "v" version))))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "1dahq0p6zn2pd408q6hsv1jl12nqrwd1gkl3r3dysk2q0z16192v"))))
-      (build-system go-build-system)
-      (arguments
-       `(#:import-path "golang.org/x/time"
-         ;; Source-only package
-         #:tests? #f
-         #:phases
-         (modify-phases %standard-phases
+  (package
+    (name "go-golang-org-x-time")
+    (version "0.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/time")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1dahq0p6zn2pd408q6hsv1jl12nqrwd1gkl3r3dysk2q0z16192v"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "golang.org/x/time"
+       ;; Source-only package
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
          ;; Source-only package
-           (delete 'build))))
-      (home-page "https://godoc.org/golang.org/x/time/rate")
-      (synopsis "Supplemental Go time libraries")
-      (description "This package provides supplemental Go libraries related to
+         (delete 'build))))
+    (home-page "https://godoc.org/golang.org/x/time/rate")
+    (synopsis "Supplemental Go time libraries")
+    (description
+     "This package provides supplemental Go libraries related to
 time.")
-      (license license:bsd-3)))
+    (license license:bsd-3)))
 
 (define-public go-golang-org-x-tools
   (package
-- 
cgit v1.2.3


From d76e297b66bcd361ccae39f900c4b3261884d307 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 15:10:47 +0100
Subject: gnu: go-golang-org-x-time: Enable tests.

* gnu/packages/golang-build.scm (go-golang-org-x-time): Apply new
package style.
[arguments]: <#:phases>: Use custom 'check phase.

Change-Id: If6b9aa9198748c4b8a2fdc23cd723aec740eb533
---
 gnu/packages/golang-build.scm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 309c56c06a..2bb2e62450 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -547,13 +547,18 @@ (define-public go-golang-org-x-time
         (base32 "1dahq0p6zn2pd408q6hsv1jl12nqrwd1gkl3r3dysk2q0z16192v"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "golang.org/x/time"
-       ;; Source-only package
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         ;; Source-only package
-         (delete 'build))))
+     (list
+      #:import-path "golang.org/x/time"
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; XXX: Workaround for go-build-system's lack of Go modules
+          ;; support.
+          (delete 'build)
+          (replace 'check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion (string-append "src/" import-path)
+                  (invoke "go" "test" "-v" "./..."))))))))
     (home-page "https://godoc.org/golang.org/x/time/rate")
     (synopsis "Supplemental Go time libraries")
     (description
-- 
cgit v1.2.3


From ced3ded8298af5b23f47537726e2c6c5595492f1 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 15:15:39 +0100
Subject: gnu: go-golang-org-x-tools: Update to 0.23.0.

* gnu/packages/golang-build.scm (go-golang-org-x-tools): Update to 0.23.0.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 2bb2e62450..6abcfee442 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -569,7 +569,7 @@ (define-public go-golang-org-x-time
 (define-public go-golang-org-x-tools
   (package
     (name "go-golang-org-x-tools")
-    (version "0.22.0")
+    (version "0.23.0")
     (source
      (origin
        (method git-fetch)
@@ -578,7 +578,7 @@ (define-public go-golang-org-x-tools
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1jn73k6qiwa70cafdmyzczsimwqyzgl9wh9vmdjs96svf5nfzb5a"))
+        (base32 "0hr81fr5s39p97m9y3ipma7ryw4nm2246k8ds0flkybzf19mhzbi"))
        (modules '((guix build utils)))
        (snippet
         '(begin
-- 
cgit v1.2.3


From 86334801d3654eb90a73f4e5d615976c5821f79b Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 16:03:55 +0100
Subject: gnu: go-golang-org-x-tools: Enable most of the tests.

* gnu/packages/golang-build.scm (go-golang-org-x-tools): Adjust package style.
[arguments]: <#:phases>: Use custom 'check phase.
[native-inputs]: Add gccgo-14.

Change-Id: If1245d0e3787ded7a783b89de251f2a65ff00917
---
 gnu/packages/golang-build.scm | 62 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 10 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 6abcfee442..b7e44e9203 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -40,7 +40,8 @@ (define-module (gnu packages golang-build)
   #:use-module (guix git-download)
   #:use-module (guix packages)
   #:use-module (guix utils)
-  #:use-module (gnu packages))
+  #:use-module (gnu packages)
+  #:use-module (gnu packages gcc))
 
 ;;; Commentary:
 ;;;
@@ -587,21 +588,62 @@ (define-public go-golang-org-x-tools
            (delete-file-recursively "gopls")))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "golang.org/x/tools"
-       ;; Source-only package
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         ;; Source-only package
-         (delete 'build))))
+     (list
+      #:import-path "golang.org/x/tools"
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; XXX: Workaround for go-build-system's lack of Go modules
+          ;; support.
+          (delete 'build)
+          (replace 'check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion (string-append "src/" import-path)
+                  (invoke "go" "test" "-v"
+                          ;; TODO: They contain final project executable builds,
+                          ;; would be packed separately.
+                          ;; - cmd
+                          ;; - godoc
+
+                          ;; FIXME: Figure out why they are failing:
+                          ;; "./internal/..."
+                          ;; "./present/..."
+                          ;; "./refactor/eg/..."
+                          ;; "./go/ssa/..."
+                          ;; "./go/packages/..."
+                          ;; "./go/analysis/..."
+
+                          "./blog/..."  ;
+                          "./container/..."
+                          "./copyright/..."
+                          "./cover/..."
+                          "./go/ast/..."
+                          "./go/buildutil/..."
+                          "./go/callgraph/..."
+                          "./go/cfg/..."
+                          "./go/expect/..."
+                          "./go/gccgoexportdata/..."
+                          "./go/gcexportdata/..."
+                          "./go/internal/..."
+                          "./go/loader/..."
+                          "./go/types/..."
+                          "./imports/..."
+                          "./playground/..."
+                          "./refactor/importgraph/..."
+                          "./refactor/rename/..."
+                          "./refactor/satisfy/..."
+                          "./txtar/..."))))))))
+    (native-inputs
+     (list gccgo-14))
     (propagated-inputs
      (list go-github-com-yuin-goldmark
            go-golang-org-x-mod
            go-golang-org-x-net
-           go-golang-org-x-sys))
+           go-golang-org-x-sync))
     (home-page "https://go.googlesource.com/tools/")
     (synopsis "Tools that support the Go programming language")
-    (description "This package provides miscellaneous tools that support the
+    (description
+     "This package provides miscellaneous tools that support the
 Go programming language.")
     (license license:bsd-3)))
 
-- 
cgit v1.2.3


From 6aa588ed8693706db62e9d412f0d8dda490aeee0 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 16:07:47 +0100
Subject: gnu: go-golang-org-x-xerrors: Update to 0.0.0-1.104605a.

* gnu/packages/golang-build.scm (go-golang-org-x-xerrors): Update to 0.0.0-1.104605a.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index b7e44e9203..6cfea89e00 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -648,8 +648,8 @@ (define-public go-golang-org-x-tools
     (license license:bsd-3)))
 
 (define-public go-golang-org-x-xerrors
-  (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca")
-        (revision "0"))
+  (let ((commit "104605ab7028f4af38a8aff92ac848a51bd53c5d")
+        (revision "1"))
     (package
       (name "go-golang-org-x-xerrors")
       (version (git-version "0.0.0" revision commit))
@@ -661,7 +661,7 @@ (define-public go-golang-org-x-xerrors
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb"))))
+          (base32 "051xfwx95vq7yhmsy8p9rq0qw67bzvimhz1icjssahwrjndm7h92"))))
       (build-system go-build-system)
       (arguments
        '(#:import-path "golang.org/x/xerrors"))
-- 
cgit v1.2.3


From 869457aadf48251d17f2b6644c0cc153e184a3eb Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 12:30:16 +0100
Subject: gnu: go-gopkg-in-square-go-jose-v2: Disable tests.

* gnu/packages/golang-web.scm (go-gopkg-in-square-go-jose-v2): Disable tests.

Change-Id: I8bfc5c1a37077b6dc63030202341112cd66dd74b
---
 gnu/packages/golang-web.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index bc8c23b243..59453dfe44 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -3145,6 +3145,8 @@ (define-public go-github-com-xeipuuv-gojsonschema
 programming language, which supports draft-04, draft-06 and draft-07.")
       (license license:asl2.0))))
 
+;; XXX: This repository has been archived by the owner on Feb 27, 2023. It is
+;; now read-only and it is DEPRECATED.
 (define-public go-gopkg-in-square-go-jose-v2
   (package
     (name "go-gopkg-in-square-go-jose-v2")
@@ -3160,7 +3162,12 @@ (define-public go-gopkg-in-square-go-jose-v2
         (base32 "1b1nhqxfmhzwrfk7pkvp2w3z3d0pf5ir00vizmy2d4xdbnldn70r"))))
     (build-system go-build-system)
     (arguments
-     (list #:import-path "gopkg.in/square/go-jose.v2"))
+     (list
+      ;; XXX: We strongly encourage users of square/go-jose to migrate to v3
+      ;; of go-jose/go-jose. No support, security fixes or updates will be
+      ;; delivered to the v1/v2 branches in the Square repository.
+      #:tests? #f
+      #:import-path "gopkg.in/square/go-jose.v2"))
     (propagated-inputs
      (list go-golang-org-x-crypto))
     (native-inputs
-- 
cgit v1.2.3


From 84ef00efdfa3dd0a8fd91d91a73ff0faf7494199 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 12:30:28 +0100
Subject: gnu: go-github-com-pkg-errors: Disable tests.

* gnu/packages/golang.scm (go-github-com-pkg-errors): Disable tests.

Change-Id: Ia1f023574e6dc4be170ad4919b6c76fdf18eb54f
---
 gnu/packages/golang.scm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 8b5e0fa747..083c597e22 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5627,6 +5627,8 @@ (define-public go-github-com-lunixbochs-vtclean
 optionally preserving color.")
     (license license:expat)))
 
+;; XXX: This repository has been archived by the owner on Dec 1, 2021. It is
+;; now read-only.
 (define-public go-github-com-pkg-errors
   (package
     (name "go-github-com-pkg-errors")
@@ -5643,15 +5645,11 @@ (define-public go-github-com-pkg-errors
     (build-system go-build-system)
     (arguments
      (list
-       #:import-path "github.com/pkg/errors"
-       #: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)))))))
+      ;; Tests fail with a newer version of Golang (1.21) due to some API
+      ;; changes in how the module path is calculated which is not reflected
+      ;; in tests.
+      #:tests? #f
+      #:import-path "github.com/pkg/errors"))
     (synopsis "Go error handling primitives")
     (description "This package provides @code{error}, which offers simple
 error handling primitives in Go.")
-- 
cgit v1.2.3


From 75bf706de5664ea00edc98ab9839b71f52023af9 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 22:25:45 +0100
Subject: gnu: go-golang-zx2c4-com-wireguard: Disable tests.

* gnu/packages/golang.scm (go-golang-zx2c4-com-wireguard): Disable tests.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 083c597e22..f7c79e3e08 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7813,7 +7813,10 @@ (define-public go-golang-zx2c4-com-wireguard
          "09a4gsh75a8bj71wr042afrma9frriqp60cm0cx6c9a8lv5yzzi0"))))
     (build-system go-build-system)
     (arguments
-     '(#:import-path "golang.zx2c4.com/wireguard"))
+     '(;; XXX: Failed on newer version of Golang, the recent release requires
+       ;; gvisor.dev/gvisor, which is huge to pack.
+       #:tests? #f
+       #:import-path "golang.zx2c4.com/wireguard"))
     (propagated-inputs
      (list go-golang-org-x-crypto go-golang-org-x-net go-golang-org-x-sys
            go-golang-org-x-text))
-- 
cgit v1.2.3


From a477fece1245bc5042bc3c39483a53d4f8c0d806 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 22:33:49 +0100
Subject: gnu: go-github-com-go-sql-driver-mysql: Update to 1.8.1.

* gnu/packages/golang.scm (go-github-com-go-sql-driver-mysql): Update to 1.8.1.
[propagated-inputs]: Add go-filippo-io-edwards25519.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f7c79e3e08..b1f664d48e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5276,7 +5276,7 @@ (define-public go-github-com-kr-text
 (define-public go-github-com-go-sql-driver-mysql
   (package
     (name "go-github-com-go-sql-driver-mysql")
-    (version "1.5.0")
+    (version "1.8.1")
     (source
      (origin
        (method git-fetch)
@@ -5286,11 +5286,13 @@ (define-public go-github-com-go-sql-driver-mysql
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"))))
+         "0ihdqg411gkv454fwx8w5nbndgkm5dz5phfliksxgmhggyxxm7sn"))))
     (build-system go-build-system)
     (arguments
      '(#:tests? #f ;; tests require a network connection
        #:import-path "github.com/go-sql-driver/mysql"))
+    (propagated-inputs
+     (list go-filippo-io-edwards25519))
     (home-page "https://github.com/go-sql-driver/mysql")
     (synopsis "MySQL driver for golang")
     (description
-- 
cgit v1.2.3


From 23c29d662b1f4e9c8503e1c3c822e9971dc41293 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 22:44:10 +0100
Subject: gnu: go-github-com-sourcegraph-jsonrpc2: Update to 0.2.0.

* gnu/packages/golang-web.scm (go-github-com-sourcegraph-jsonrpc2): Update to 0.2.0.
[propagated-inputs]: Remove go-github-com-daviddengcn-go-colortext and
go-github-com-motemen-go-colorine.

Change-Id: I8c46e08c6f5d837cd213c157b08fe4a2fd1d320b
---
 gnu/packages/golang-web.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 59453dfe44..275a19617c 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -2738,7 +2738,7 @@ (define-public go-github-com-sherclockholmes-webpush-go
 (define-public go-github-com-sourcegraph-jsonrpc2
   (package
     (name "go-github-com-sourcegraph-jsonrpc2")
-    (version "0.1.0")
+    (version "0.2.0")
     (home-page "https://github.com/sourcegraph/jsonrpc2")
     (source
      (origin
@@ -2748,14 +2748,12 @@ (define-public go-github-com-sourcegraph-jsonrpc2
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1dk0w32k96vxrwnmm24wqx337dn8ylch65qwrbc3wh7whw2xx71q"))))
+        (base32 "1id35b4mhif9gy1b70mv0x7xkmpm2p8xydix8six10yjyhvm1wjh"))))
     (build-system go-build-system)
     (arguments
      '(#:import-path "github.com/sourcegraph/jsonrpc2"))
     (propagated-inputs
-     (list go-github-com-daviddengcn-go-colortext
-           go-github-com-gorilla-websocket
-           go-github-com-motemen-go-colorine))
+     (list go-github-com-gorilla-websocket))
     (synopsis "Provides a client and server implementation of JSON-RPC 2.0")
     (description
      "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.")
-- 
cgit v1.2.3


From ef228f65488d8e2f4e79966729fe6458b2ba0bd7 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 22:52:34 +0100
Subject: gnu: go-github-com-golangplus-fmt: Disable tests.

* gnu/packages/golang.scm (go-github-com-golangplus-fmt): Disable tests.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b1f664d48e..622cc0f22f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -2604,7 +2604,8 @@ (define-public go-github-com-golangplus-fmt
                (base32 "07d5kxz0f8ss3v46y0c8jg02sagi0wlaaijhjzzp0r462jyzqii7"))))
     (build-system go-build-system)
     (arguments
-     '(#:import-path "github.com/golangplus/fmt"))
+     '(#:tests? #f ; failing with new Golang compiler.
+       #:import-path "github.com/golangplus/fmt"))
     (synopsis "Additions to Go's standard @code{fmt} package")
     (description "This package provides additions to Go's stdlib @code{fmt}.")
     (license license:bsd-3)))
-- 
cgit v1.2.3


From 30bd3168f4d5d9ddbd33ebea84f5464e8d05c044 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 22:52:34 +0100
Subject: gnu: ghq: Update to 1.6.2.

* gnu/packages/version-control.scm (ghq): Update to 1.6.2.

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

(limited to 'gnu')

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index f2898b519a..3267a541a1 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3810,7 +3810,7 @@ (define-public gita
 (define-public ghq
   (package
     (name "ghq")
-    (version "1.1.7")
+    (version "1.6.2")
     (home-page "https://github.com/x-motemen/ghq")
     (source (origin
               (method git-fetch)
@@ -3820,7 +3820,7 @@ (define-public ghq
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "155sfmhmh4ia3iinm1s8fk7fxyn5dxdryad9xkbg7mr3i3ikqjwh"))))
+                "00rrm0gykmj60i0lnr4js6d4193c92zm3cimimb03xva4n9frvxw"))))
     (build-system go-build-system)
     (arguments
      (list
-- 
cgit v1.2.3


From e5be40522e59b468c6d4e68c4f049cf00357f013 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 22:57:30 +0100
Subject: gnu: go-github-com-go-jose-go-jose-v3: Update to 3.0.3.

* gnu/packages/golang-web.scm (go-github-com-go-jose-go-jose-v3): Update to 3.0.3.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 275a19617c..b3cc543849 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -786,7 +786,7 @@ (define-public go-github-com-go-chi-chi-v5
 (define-public go-github-com-go-jose-go-jose-v3
   (package
     (name "go-github-com-go-jose-go-jose-v3")
-    (version "3.0.0")
+    (version "3.0.3")
     (source
      (origin
        (method git-fetch)
@@ -795,7 +795,7 @@ (define-public go-github-com-go-jose-go-jose-v3
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1fnw0p49wc9gmd2xcji2x9jf97dgg9igagd5m6bmq3nw9jjfqdc5"))))
+        (base32 "0kbkplhzqv9ai28r4smhdsxxwh20d96srr3am37pwwnh48ivwch8"))))
     (build-system go-build-system)
     (arguments
      '( #:import-path "github.com/go-jose/go-jose/v3"))
-- 
cgit v1.2.3


From a82f7e68a676f7b9caf1ac23ea31d3a91c75f6ed Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 23:02:50 +0100
Subject: gnu: Add go-github-com-go-jose-go-jose-v4.

* gnu/packages/golang-web.scm (go-github-com-go-jose-go-jose-v4): New variable.

Change-Id: I5edfc5e413cc50c010aab1ad4a189afabf5cd640
---
 gnu/packages/golang-web.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'gnu')

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index b3cc543849..0fb966ed79 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -812,6 +812,24 @@ (define-public go-github-com-go-jose-go-jose-v3
 Encryption, JSON Web Signature, and JSON Web Token standards.")
     (license license:asl2.0)))
 
+(define-public go-github-com-go-jose-go-jose-v4
+  (package
+    (inherit go-github-com-go-jose-go-jose-v3)
+    (name "go-github-com-go-jose-go-jose-v4")
+    (version "4.0.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/go-jose/go-jose")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1bf444687q5rdxjgk41bkryhzhx49f6600b7i51m572xdl0r28a9"))))
+    (arguments
+     (list
+      #:import-path "github.com/go-jose/go-jose/v4"))))
+
 (define-public go-github-com-go-ldap-ldap
   (package
     (name "go-github-com-go-ldap-ldap")
-- 
cgit v1.2.3


From bf385c341e1071a5c3a6ff9cc658fec21c987758 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 23:23:39 +0100
Subject: gnu: Add go-github-com-yuin-goldmark-emoji.

* gnu/packages/golang-build.scm (go-github-com-yuin-goldmark-emoji): New variable.

Change-Id: I3c5e7aa824c5dbb1dc0ec0aa999a2cbd4b463ed2
---
 gnu/packages/golang-build.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'gnu')

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 6cfea89e00..fbad61e269 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -88,6 +88,32 @@ (define-public go-github-com-yuin-goldmark
      "This package provides a markdown parser.")
     (license license:expat)))
 
+(define-public go-github-com-yuin-goldmark-emoji
+  (package
+    (name "go-github-com-yuin-goldmark-emoji")
+    (version "1.0.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/yuin/goldmark-emoji")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1mx8rkxd3ksvgi41jvf365x9mf00sxiqq4wm75x4sasd2lgcbrl4"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/yuin/goldmark-emoji"))
+    (propagated-inputs
+     (list go-github-com-yuin-goldmark))
+    (home-page "https://github.com/yuin/goldmark-emoji")
+    (synopsis "Emoji extension for the goldmark markdown parser")
+    (description
+     "This package provides an emoji is a extension for the
+@url{http://github.com/yuin/goldmark,goldmark}.")
+    (license license:expat)))
+
 (define-public go-golang-org-x-crypto
   (package
     (name "go-golang-org-x-crypto")
-- 
cgit v1.2.3


From a60fd377622f76e4a4d9f728624956c5d0d9e59d Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Fri, 12 Jul 2024 23:39:05 +0100
Subject: gnu: go-github-com-muesli-reflow-wordwrap: Consolidate other
 packages.

Rename go-github-com-muesli-reflow-wordwrap to
go-github-com-muesli-reflow which would contain all submodules to ease
maintenance.

* gnu/packages/golang.scm (go-github-com-muesli-reflow): Refresh package
style.
[arguments]: <#unpack-path>: Remove it. <#:import-path>: Adjust it to
reflect the go.mod. <#:phases>: Use custom 'check phase.
[description]: Place on a new line.

* gnu/packages/golang.scm (go-github-com-muesli-reflow-ansi,
go-github-com-muesli-reflow-indent, go-github-com-muesli-reflow-padding,
go-github-com-muesli-reflow-truncate): Delete variables.

* gnu/packages/configuration-management.scm (chezmoi): Adjust inputs.
[native-inputs]: Remove go-github-com-muesli-reflow-ansi,
go-github-com-muesli-reflow-indent, go-github-com-muesli-reflow-padding,
and go-github-com-muesli-reflow.

* gnu/packages/golang.scm (go-github-com-charmbracelet-glamour): Likewise.
[native-inputs]: Remove go-github-com-muesli-reflow-ansi,
go-github-com-muesli-reflow-wordwrap,
go-github-com-muesli-reflow-indent, and go-github-com-muesli-reflow.

* gnu/packages/golang.scm (go-github-com-charmbracelet-bubbletea): Likewise.
[propagated-inputs]: Remove go-github-com-muesli-reflow-indent,
go-github-com-muesli-reflow-ansi, and and go-github-com-muesli-reflow.

Change-Id: I2e0f2abad36bd6a9ca98e2505fcd90273294213b
---
 gnu/packages/configuration-management.scm |  5 +-
 gnu/packages/golang.scm                   | 84 +++++++++++--------------------
 2 files changed, 30 insertions(+), 59 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index 5a67de919f..cded9b0bb8 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -100,10 +100,7 @@ (define-public chezmoi
            go-github-com-mattn-go-isatty
            go-github-com-mattn-go-runewidth
            go-github-com-microcosm-cc-bluemonday
-           go-github-com-muesli-reflow-ansi
-           go-github-com-muesli-reflow-indent
-           go-github-com-muesli-reflow-padding
-           go-github-com-muesli-reflow-wordwrap
+           go-github-com-muesli-reflow
            go-github-com-muesli-termenv
            go-github-com-olekukonko-tablewriter
            go-github-com-pelletier-go-toml
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 622cc0f22f..2eee149ab6 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6706,63 +6706,42 @@ (define-public go-github-com-bmatcuk-doublestar-v4
      (list
       #:import-path "github.com/bmatcuk/doublestar/v4"))))
 
-(define-public go-github-com-muesli-reflow-wordwrap
+(define-public go-github-com-muesli-reflow
   (package
-    (name "go-github-com-muesli-reflow-wordwrap")
+    (name "go-github-com-muesli-reflow")
     (version "0.3.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/muesli/reflow")
-                    (commit (string-append "v" version))))
-              (file-name (git-file-name "go-github-com-muesli-reflow" version))
-              (sha256
-               (base32
-                "09zcz2cqdwgj1ilya5pqwndryk6lansn87x63fcm8j1xn74vd2ry"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/muesli/reflow")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name "go-github-com-muesli-reflow" version))
+       (sha256
+        (base32 "09zcz2cqdwgj1ilya5pqwndryk6lansn87x63fcm8j1xn74vd2ry"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "github.com/muesli/reflow/wordwrap"
-       #:unpack-path "github.com/muesli/reflow"))
-    (native-inputs
+     (list
+      #:import-path "github.com/muesli/reflow"
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; XXX: Workaround for go-build-system's lack of Go modules
+          ;; support.
+          (delete 'build)
+          (replace 'check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion (string-append "src/" import-path)
+                  (invoke "go" "test" "-v" "./..."))))))))
+    (propagated-inputs
      (list go-github-com-mattn-go-runewidth))
     (home-page "https://github.com/muesli/reflow/")
     (synopsis "Collection of methods helping to transform blocks of text")
-    (description "This package provides a collection of ANSI-aware methods and
-io.Writers helping you to transform blocks of text.")
+    (description
+     "This package provides a collection of ANSI-aware methods and io.Writers
+helping you to transform blocks of text.")
     (license license:expat)))
 
-(define-public go-github-com-muesli-reflow-ansi
-  (package
-    (inherit go-github-com-muesli-reflow-wordwrap)
-    (name "go-github-com-muesli-reflow-ansi")
-    (arguments
-     `(#:import-path "github.com/muesli/reflow/ansi"
-       #:unpack-path "github.com/muesli/reflow"))))
-
-(define-public go-github-com-muesli-reflow-indent
-  (package
-    (inherit go-github-com-muesli-reflow-wordwrap)
-    (name "go-github-com-muesli-reflow-indent")
-    (arguments
-     `(#:import-path "github.com/muesli/reflow/indent"
-       #:unpack-path "github.com/muesli/reflow"))))
-
-(define-public go-github-com-muesli-reflow-padding
-  (package
-    (inherit go-github-com-muesli-reflow-wordwrap)
-    (name "go-github-com-muesli-reflow-padding")
-    (arguments
-     `(#:import-path "github.com/muesli/reflow/padding"
-       #:unpack-path "github.com/muesli/reflow"))))
-
-(define-public go-github-com-muesli-reflow-truncate
-  (package
-    (inherit go-github-com-muesli-reflow-wordwrap)
-    (name "go-github-com-muesli-reflow-truncate")
-    (arguments
-     `(#:import-path "github.com/muesli/reflow/truncate"
-       #:unpack-path "github.com/muesli/reflow"))))
-
 (define-public go-github-com-muesli-termenv
   (package
     (name "go-github-com-muesli-termenv")
@@ -6895,10 +6874,7 @@ (define-public go-github-com-charmbracelet-glamour
            go-github-com-chris-ramon-douceur
            go-github-com-aymerick-douceur
            go-github-com-gorilla-css
-           go-github-com-muesli-reflow-ansi
-           go-github-com-muesli-reflow-wordwrap
-           go-github-com-muesli-reflow-indent
-           go-github-com-muesli-reflow-padding
+           go-github-com-muesli-reflow
            go-github-com-mattn-go-runewidth
            go-github-com-muesli-termenv
            go-github-com-google-goterm
@@ -8420,11 +8396,9 @@ (define-public go-github-com-charmbracelet-bubbletea
      `(("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty)
        ("github.com/muesli/termenv" ,go-github-com-muesli-termenv)
        ("github.com/mattn/go-runewidth" ,go-github-com-mattn-go-runewidth)
-       ("go-github-com-muesli-reflow-indent" ,go-github-com-muesli-reflow-indent)
-       ("go-github-com-muesli-reflow-ansi" ,go-github-com-muesli-reflow-ansi)
+       ("go-github-com-muesli-reflow" ,go-github-com-muesli-reflow)
        ("go-github-com-lucasb-eyer-go-colorful" ,go-github-com-lucasb-eyer-go-colorful)
        ("github.com/containerd/console" ,go-github-com-containerd-console)
-       ("go-github-com-muesli-reflow-truncate" ,go-github-com-muesli-reflow-truncate)
        ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)
        ("go-golang-org-x-sys" ,go-golang-org-x-sys)
        ("go-golang-org-x-term" ,go-golang-org-x-term)
-- 
cgit v1.2.3


From 54f52ae1363ddc8c60051a678f941cc0c00b9877 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 00:08:25 +0100
Subject: gnu: Add go-github-com-aymanbagabas-go-osc52-v2.

* gnu/packages/golang-xyz.scm (go-github-com-aymanbagabas-go-osc52-v2):
New variable.

Change-Id: I6a6bcfb2edce1e062034bd84648c1f4c563c560f
---
 gnu/packages/golang-xyz.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'gnu')

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index bd4f7da876..9a85f7399d 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -820,6 +820,30 @@ (define-public go-github-com-audriusbutkevicius-recli
 stored in a Go struct.")
     (license license:mpl2.0)))
 
+(define-public go-github-com-aymanbagabas-go-osc52-v2
+  (package
+    (name "go-github-com-aymanbagabas-go-osc52-v2")
+    (version "2.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/aymanbagabas/go-osc52")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1y4y49zys7fi5wpicpdmjqnk0mb6569zg546km02yck2349jl538"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/aymanbagabas/go-osc52/v2"))
+    (home-page "https://github.com/aymanbagabas/go-osc52")
+    (synopsis "Terminal ANSI OSC52 wrapper")
+    (description
+     "OSC52 is a terminal escape sequence that allows copying text to the
+clipboard.")
+    (license license:expat)))
+
 (define-public go-github-com-benbjohnson-clock
   (package
     (name "go-github-com-benbjohnson-clock")
-- 
cgit v1.2.3


From 717783f83d4de940b4dbf7a447d061188b947567 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 00:12:33 +0100
Subject: gnu: go-github-com-muesli-termenv: Update to 0.15.2.

* gnu/packages/golang.scm (go-github-com-muesli-termenv): Update to 0.15.2.
[propagated-inputs]: Add go-github-com-aymanbagabas-go-osc52-v2,
go-github-com-lucasb-eyer-go-colorful, go-github-com-mattn-go-isatty,
go-github-com-mattn-go-runewidth, and go-golang-org-x-sys.
[native-inputs]: Remove go-github-com-google-goterm,
go-github-com-lucasb-eyer-go-colorful, go-github-com-mattn-go-isatty,
and go-github-com-mattn-go-runewidth.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 2eee149ab6..60633fd0c0 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6745,7 +6745,7 @@ (define-public go-github-com-muesli-reflow
 (define-public go-github-com-muesli-termenv
   (package
     (name "go-github-com-muesli-termenv")
-    (version "0.8.1")
+    (version "0.15.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -6754,15 +6754,16 @@ (define-public go-github-com-muesli-termenv
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0m24ljq1nq7z933fcvg99fw0fhxj9rb5ll4rlay7z2f2p59mrbdp"))))
+                "19yhli6k79aqpra4djp0cl4q76mqxbc1f7in20y0dzhnjb7yz42p"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/muesli/termenv"))
-    (native-inputs
-     (list go-github-com-google-goterm
+    (propagated-inputs
+     (list go-github-com-aymanbagabas-go-osc52-v2
            go-github-com-lucasb-eyer-go-colorful
            go-github-com-mattn-go-isatty
-           go-github-com-mattn-go-runewidth))
+           go-github-com-mattn-go-runewidth
+           go-golang-org-x-sys))
     (home-page "https://github.com/muesli/termenv/")
     (synopsis "Advanced styling options on the terminal")
     (description "termenv lets you safely use advanced styling options on the
-- 
cgit v1.2.3


From b94b99c664ed498e611e6e04db1b439f3a30a98b Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 00:23:45 +0100
Subject: gnu: go-github-com-charmbracelet-glamour: Update to 0.7.0.

* gnu/packages/golang.scm (go-github-com-charmbracelet-glamour): Update to 0.7.0.
[arguments]: <#:phases>: Add 'copy-input-to-vendor-directory and
'remove-vendor-directory phases.
[propagated-inputs]: Add go-github-com-alecthomas-chroma-v2,
go-github-com-microcosm-cc-bluemonday, go-github-com-muesli-reflow,
go-github-com-muesli-termenv, go-github-com-olekukonko-tablewriter,
go-github-com-yuin-goldmark, and go-github-com-yuin-goldmark-emoji.
[native-inputs]: Remove go-github-com-alecthomas-chroma,
go-github-com-danwakefield-fnmatch, go-github-com-dlclark-regexp2,
go-github-com-microcosm-cc-bluemonday,
go-github-com-chris-ramon-douceur, go-github-com-aymerick-douceur,
go-github-com-gorilla-css, go-github-com-muesli-reflow,
go-github-com-mattn-go-runewidth, go-github-com-muesli-termenv,
go-github-com-google-goterm, go-github-com-lucasb-eyer-go-colorful,
go-github-com-mattn-go-isatty, go-github-com-olekukonko-tablewriter,
go-github-com-yuin-goldmark, and go-golang-org-x-net.

Change-Id: I4ab5c05d91c37dfb1904cc2ee2eb173f6175663a
---
 gnu/packages/golang.scm | 72 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 44 insertions(+), 28 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 60633fd0c0..4d1a07355c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6841,7 +6841,7 @@ (define-public go-github-com-olekukonko-ts
 (define-public go-github-com-charmbracelet-glamour
   (package
     (name "go-github-com-charmbracelet-glamour")
-    (version "0.2.0")
+    (version "0.7.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -6850,40 +6850,56 @@ (define-public go-github-com-charmbracelet-glamour
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1idq8d13rp1hx2a1xak31fwl9fmi09p2x4ymvzl7aj850saw5w0z"))))
+                "073kyx94r9f0hpjv5c3x9pfdd3dbpyqcy7jhx4yxz0ps25j1a41p"))))
     (build-system go-build-system)
     (arguments
-     (list #:import-path "github.com/charmbracelet/glamour"
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'patch-tests
-                 (lambda _
-                   ;; Some tests fail due to different number of '^[0m' symbols at
-                   ;; the beginning and the end of paragraphs.  To fix that we
-                   ;; re-generate 'readme.test' so the test output will match the
-                   ;; 'readme.test' contents.
-                   (chmod "src/github.com/charmbracelet/glamour/testdata/readme.test"
-                          #o644)
-                   (substitute* "src/github.com/charmbracelet/glamour/glamour_test.go"
-                     (("	generate = false")
-                      "	generate = true")))))))
-    (native-inputs
-     (list go-github-com-alecthomas-chroma
-           go-github-com-danwakefield-fnmatch
-           go-github-com-dlclark-regexp2
+     (list
+      #:import-path "github.com/charmbracelet/glamour"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-tests
+            (lambda _
+              ;; Some tests fail due to different number of '^[0m' symbols at
+              ;; the beginning and the end of paragraphs.  To fix that we
+              ;; re-generate 'readme.test' so the test output will match the
+              ;; 'readme.test' contents.
+              (chmod "src/github.com/charmbracelet/glamour/testdata/readme.test"
+                     #o644)
+              (substitute* "src/github.com/charmbracelet/glamour/glamour_test.go"
+                (("	generate = false")
+                 "	generate = true"))))
+          ;; FIXME: Pattern embedded: cannot embed directory embedded:
+          ;; contains no embeddable files.
+          ;;
+          ;; This happens due to Golang can't determine the valid directory of
+          ;; the module which is sourced during setup environment phase, but
+          ;; easy resolved after coping to expected directory "vendor" within
+          ;; the current package, see details in Golang source:
+          ;;
+          ;; - URL: <https://github.com/golang/go/blob/>
+          ;; - commit: 82c14346d89ec0eeca114f9ca0e88516b2cda454
+          ;; - file: src/cmd/go/internal/load/pkg.go#L2059
+          (add-before 'build 'copy-input-to-vendor-directory
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (mkdir "vendor")
+                (copy-recursively
+                 (string-append
+                  #$(this-package-input "go-github-com-alecthomas-chroma-v2")
+                  "/src/github.com")
+                 "vendor/github.com"))))
+          (add-before 'install 'remove-vendor-directory
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (delete-file-recursively "vendor")))))))
+    (propagated-inputs
+     (list go-github-com-alecthomas-chroma-v2
            go-github-com-microcosm-cc-bluemonday
-           go-github-com-chris-ramon-douceur
-           go-github-com-aymerick-douceur
-           go-github-com-gorilla-css
            go-github-com-muesli-reflow
-           go-github-com-mattn-go-runewidth
            go-github-com-muesli-termenv
-           go-github-com-google-goterm
-           go-github-com-lucasb-eyer-go-colorful
-           go-github-com-mattn-go-isatty
            go-github-com-olekukonko-tablewriter
            go-github-com-yuin-goldmark
-           go-golang-org-x-net))
+           go-github-com-yuin-goldmark-emoji))
     (home-page "https://github.com/charmbracelet/glamour/")
     (synopsis "Write handsome command-line tools with glamour")
     (description "@code{glamour} lets you render markdown documents and
-- 
cgit v1.2.3


From e61013a0d8658f4c7eb3cd7020e8dafe69307a4a Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 09:20:49 +0100
Subject: gnu: packages/golang-chrypto: Sort some packages.

Adjust order of some packages and place them in other golang-* ones, it
contains inherited packages which produce just executable CLI commands
without source installed.

* gnu/packages/golang-crypto.scm (age, age-keygen): Move variable to the
end of file.

Change-Id: I58db45f58c537c1c1d59ca29d89267ddd5f5260c
---
 gnu/packages/golang-crypto.scm | 44 +++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 18 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 0d04e26479..a1c75620b8 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -63,6 +63,10 @@ (define-module (gnu packages golang-crypto)
 ;;;
 ;;; Code:
 
+;;;
+;;; Libraries:
+;;;
+
 (define-public go-filippo-io-age
   (package
     (name "go-filippo-io-age")
@@ -92,24 +96,6 @@ (define-public go-filippo-io-age
 composability.")
     (license license:bsd-3)))
 
-(define-public age
-  (package
-    (inherit go-filippo-io-age)
-    (name "age")
-    (arguments
-     `(#:import-path "filippo.io/age/cmd/age"
-       #:unpack-path "filippo.io/age"
-       #:install-source? #f))))
-
-(define-public age-keygen
-  (package
-    (inherit go-filippo-io-age)
-    (name "age-keygen")
-    (arguments
-     `(#:import-path "filippo.io/age/cmd/age-keygen"
-       #:unpack-path "filippo.io/age"
-       #:install-source? #f))))
-
 (define-public go-filippo-io-edwards25519
   (package
     (name "go-filippo-io-edwards25519")
@@ -1363,6 +1349,28 @@ (define-public go-torproject-org-pluggable-transports-goptlib
     (description "GoPtLib is a library for writing Tor pluggable transports in
 Go.")
     (license license:cc0)))
+
+;;;
+;;; Executables:
+;;;
+
+(define-public age
+  (package
+    (inherit go-filippo-io-age)
+    (name "age")
+    (arguments
+     `(#:import-path "filippo.io/age/cmd/age"
+       #:unpack-path "filippo.io/age"
+       #:install-source? #f))))
+
+(define-public age-keygen
+  (package
+    (inherit go-filippo-io-age)
+    (name "age-keygen")
+    (arguments
+     `(#:import-path "filippo.io/age/cmd/age-keygen"
+       #:unpack-path "filippo.io/age"
+       #:install-source? #f))))
 
 ;;;
 ;;; Avoid adding new packages to the end of this file. To reduce the chances
-- 
cgit v1.2.3


From 26e7288812f06364c3ddd21207cd80d0b068739e Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 09:36:30 +0100
Subject: gnu: Add go-c2sp-org-cctv-age.

* gnu/packages/golang-crypto.scm (go-c2sp-org-cctv-age): New variable.

Change-Id: Ib7f88cc33de9e4521df21856312182eff221f0a7
---
 gnu/packages/golang-crypto.scm | 49 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

(limited to 'gnu')

diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index a1c75620b8..ad829551e7 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -67,6 +67,55 @@ (define-module (gnu packages golang-crypto)
 ;;; Libraries:
 ;;;
 
+(define-public go-c2sp-org-cctv-age
+  (package
+    (name "go-c2sp-org-cctv-age")
+    (version "0.0.0-20240306222714-3ec4d716e805")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/C2SP/CCTV")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "00bk05ca94lm3b029ycwj0krmg2gfjv1c3pc7dvq9gmwwzr564v5"))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin
+            ;; Sub folders containing different projects with their own
+            ;; licenses.
+            (for-each delete-file-recursively
+                      (list "ML-KEM" "RFC6979" "ed25519" "jq255"))))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "c2sp.org/CCTV/age"
+      #:unpack-path "c2sp.org/CCTV"))
+    (propagated-inputs
+     (list go-golang-org-x-crypto))
+    (home-page "https://c2sp.org/CCTV/age")
+    (synopsis "Community Cryptography Test Vectors")
+    (description
+     "This package provides a large set of test vectors for the age file
+encryption format, as well as a framework to easily generate them.
+
+The test suite can be applied to any age implementation, regardless of the
+language it's implemented in, and the level of abstraction of its
+interface.  For the simplest, most universal integration, the implementation
+can just attempt to decrypt the test files, check the operation only succeeds
+if expect is success, and compare the decrypted payload.  Test vectors
+involving unimplemented features (such as passphrase encryption or armoring)
+can be ignored.")
+    ;; age/internal/LICENSE: Redistribution and use in source and binary
+    ;; forms, with or without modification, are permitted provided that the
+    ;; following conditions are met
+    ;;
+    ;; age/README: The vectors in the testdata folder are available under the
+    ;; terms of the Zero-Clause BSD (reproduced below), CC0 1.0, or Unlicense
+    ;; license, to your choice.
+    (license license:cc0)))
+
 (define-public go-filippo-io-age
   (package
     (name "go-filippo-io-age")
-- 
cgit v1.2.3


From 74a464d549e89aa0de37c119faf3a2695a1fca55 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 09:47:34 +0100
Subject: gnu: go-filippo-io-age: Update to 1.2.0.

* gnu/packages/golang-crypto.scm (go-filippo-io-age): Update to 1.2.0.
[arguments]: <#:phases>: Add 'copy-input-to-vendor-directory phase, and
'remove-vendor-directory.
[inputs]: Remove go-golang-org-x-sys, go-golang-org-x-term,
go-golang-org-x-crypto, and go-filippo-io-edwards25519.
[propagated-inputs]: Add go-golang-org-x-sys, go-golang-org-x-term,
go-golang-org-x-crypto, and go-filippo-io-edwards25519.
[native-inputs]: Add go-c2sp-org-cctv-age and
go-github-com-rogpeppe-go-internal.

Change-Id: I625001aa320653fd05db5d214948a9c5d0c200a3
---
 gnu/packages/golang-crypto.scm | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index ad829551e7..de0c631984 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -119,7 +119,7 @@ (define-public go-c2sp-org-cctv-age
 (define-public go-filippo-io-age
   (package
     (name "go-filippo-io-age")
-    (version "1.1.1")
+    (version "1.2.0")
     (source
      (origin
        (method git-fetch)
@@ -128,10 +128,41 @@ (define-public go-filippo-io-age
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1k1dv1jkr72qpk5g363mhrg9hnf5c9qgv4l16l13m4yh08jp271d"))))
+        (base32 "1dms32lxqgjipmlisng7dmy1sdw0qscj43x9lmpadyzbzc64lhrv"))))
     (build-system go-build-system)
-    (arguments `(#:import-path "filippo.io/age"))
-    (inputs
+    (arguments
+     (list
+      #:import-path "filippo.io/age"
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; FIXME: src/c2sp.org/CCTV/age/age.go:13:12: pattern testdata:
+          ;; cannot embed directory testdata: contains no embeddable files
+          ;;
+          ;; This happens due to Golang can't determine the valid directory of
+          ;; the module which is sourced during setup environment phase, but
+          ;; easy resolved after coping to expected directory "vendor" within
+          ;; the current package, see details in Golang source:
+          ;;
+          ;; - URL: <https://github.com/golang/go/blob/>
+          ;; - commit: 82c14346d89ec0eeca114f9ca0e88516b2cda454
+          ;; - file: src/cmd/go/internal/load/pkg.go#L2059
+          (add-before 'build 'copy-input-to-vendor-directory
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (mkdir "vendor")
+                (copy-recursively
+                 (string-append
+                  #$(this-package-native-input "go-c2sp-org-cctv-age")
+                  "/src/c2sp.org")
+                 "vendor/c2sp.org"))))
+          (add-before 'install 'remove-vendor-directory
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (delete-file-recursively "vendor")))))))
+    (native-inputs
+     (list go-c2sp-org-cctv-age
+           go-github-com-rogpeppe-go-internal))
+    (propagated-inputs
      (list go-golang-org-x-sys
            go-golang-org-x-term
            go-golang-org-x-crypto
-- 
cgit v1.2.3


From 1cb1442a4045dad8bead9c4b1217fcdba71902b2 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 09:54:29 +0100
Subject: gnu: age: Remove some failing test data.

* gnu/packages/golang-crypto.scm (age): Refresh package style.
[argument]: <#:phases>: Add 'remove-failing-test-data-files phase.

Change-Id: I8875ebf6140467353f6893daeb818f71a9151924
---
 gnu/packages/golang-crypto.scm | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index de0c631984..d7d604c04c 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -1439,9 +1439,24 @@ (define-public age
     (inherit go-filippo-io-age)
     (name "age")
     (arguments
-     `(#:import-path "filippo.io/age/cmd/age"
-       #:unpack-path "filippo.io/age"
-       #:install-source? #f))))
+     (list
+      #:install-source? #f
+      #:import-path "filippo.io/age/cmd/age"
+      #:unpack-path "filippo.io/age"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'remove-failing-test-data-files
+            ;; FIXME: testdata/output_file.txt:49: unknown command "ttyin"
+            ;; age: error: input and output file are the same: "inputcopy"
+            ;; age: error: input and output file are the same: "./inputcopy"
+            ;; age: error: input and output file are the same: "keycopy"
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (for-each delete-file
+                          (list "testdata/scrypt.txt"
+                                "testdata/output_file.txt"
+                                "testdata/encrypted_keys.txt"
+                                "testdata/terminal.txt"))))))))))
 
 (define-public age-keygen
   (package
-- 
cgit v1.2.3


From 59b22fbe0ed67361702dfd65ad6ec05b284c24bb Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 14:49:07 +0100
Subject: gnu: go-honnef-co-go-tools: Update to 0.4.7.

* gnu/packages/golang-check.scm (go-honnef-co-go-tools): Update to 0.4.7.
[propagated-inputs]: Remove go-golang-org-x-exp; add go-golang-org-x-exp-typeparams.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 3dce518511..53c876ae00 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -1323,7 +1323,7 @@ (define-public go-go-uber-org-mock
 (define-public go-honnef-co-go-tools
   (package
     (name "go-honnef-co-go-tools")
-    (version "0.4.6")
+    (version "0.4.7")
     (source
      (origin
        (method git-fetch)
@@ -1333,7 +1333,7 @@ (define-public go-honnef-co-go-tools
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "0qikkhanmc0vrpgvs0c44y853n88m8qqsk08zry6mvm8f41pgjhi"))))
+         "1n58skq2a0vhsgdfdkyqi00d3vv13kiw9b4mxx6xfyb6ysrdy7d1"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "honnef.co/go/tools"
@@ -1343,7 +1343,7 @@ (define-public go-honnef-co-go-tools
                   (delete 'build))))
     (propagated-inputs
      (list go-github-com-burntsushi-toml
-           go-golang-org-x-exp
+           go-golang-org-x-exp-typeparams
            go-golang-org-x-mod
            go-golang-org-x-tools))
     (home-page "https://staticcheck.dev/")
-- 
cgit v1.2.3


From 39b908a389fcea3660c628920f4ba5d6510dbe64 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 14:51:17 +0100
Subject: gnu: go-honnef-co-go-tools: Enable tests.

* gnu/packages/golang-check.scm (go-honnef-co-go-tools): Apply new
package style.
[arguments]: <#:phases>: Use custom 'check phase.

Change-Id: Idecf23f79ea554a84bce57a4dd356dde5f0b300a
---
 gnu/packages/golang-check.scm | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index 53c876ae00..b3c5286a72 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -1336,11 +1336,17 @@ (define-public go-honnef-co-go-tools
          "1n58skq2a0vhsgdfdkyqi00d3vv13kiw9b4mxx6xfyb6ysrdy7d1"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "honnef.co/go/tools"
-       #:tests? #f
-       ;; Source-only package
-       #:phases (modify-phases %standard-phases
-                  (delete 'build))))
+     (list
+      #:import-path "honnef.co/go/tools"
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; XXX: Workaround for go-build-system's lack of Go modules support.
+          (delete 'build)
+          (replace 'check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion (string-append "src/" import-path)
+                  (invoke "go" "test" "-v" "./..."))))))))
     (propagated-inputs
      (list go-github-com-burntsushi-toml
            go-golang-org-x-exp-typeparams
-- 
cgit v1.2.3


From 07dbf74fb83c17cb9851ff4fa2f3435feaab1083 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 18:29:08 +0100
Subject: gnu: govulncheck: Update to 0.0.0-20230110180137-6ad3e3d07815.

* gnu/packages/golang.scm (govulncheck): Update to
0.0.0-20230110180137-6ad3e3d07815.
[arguments]: <#:tests?>: Disable as requiring network access.
<#:import-path>: Adjust to reflect go.mod for cmd/.
<#:unpack-path>: Add it.
<#:phases>: Remove all redundant custom phases.

Change-Id: I57dd70fd2e018d9d92a2170d7e9c32080d7d2c2c
---
 gnu/packages/golang.scm | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4d1a07355c..dd629ad29c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3157,7 +3157,9 @@ (define-public go-github-com-tj-docopt
 (define-public govulncheck
   (package
     (name "govulncheck")
-    (version "0.0.0-20221229164908-ebf31f7dc3ef")
+    ;; XXX: Newer version of govulncheck requires golang.org/x/telemetry,
+    ;; which needs to be discussed if it may be included in Guix.
+    (version "0.0.0-20230110180137-6ad3e3d07815")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -3166,23 +3168,13 @@ (define-public govulncheck
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1w055g90k7anrrcvfrsqklxzl9pl0vqdiwpayj9f0brwys9xhj7d"))))
+                "1fhz27ni8bs872rgvqq700qacak9v45zy0fh2hilq21sk6dks72r"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "golang.org/x/vuln"
+     `(#:tests? #f ; it tires to download modules from the network
        #:install-source? #f
-       #:phases ,#~(modify-phases %standard-phases
-                     (add-after 'unpack 'remove-go-mod-tidy
-                       (lambda _
-                         (substitute* "src/golang.org/x/vuln/checks.bash"
-                           (("go mod tidy")
-                            #$(file-append coreutils-minimal "/bin/true")))))
-                     (replace 'build
-                       (lambda arguments
-                         (apply (assoc-ref %standard-phases
-                                           'build)
-                                `(,@arguments #:import-path
-                                  "golang.org/x/vuln/cmd/govulncheck")))))))
+       #:import-path "golang.org/x/vuln/cmd/govulncheck"
+       #:unpack-path "golang.org/x/vuln"))
     (native-inputs (list coreutils-minimal))
     (inputs (list go-golang-org-x-sys
                   go-github-com-google-renameio
-- 
cgit v1.2.3


From 33edddb2cacec8cbbd3507d8a77c64d64f73e935 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 22:20:55 +0100
Subject: gnu: govulncheck: Adjust package style.

* gnu/packages/golang.scm (govulncheck): Adjust indentation and swap
inputs to propagated-inputs.
[inputs]: Remove go-golang-org-x-sys, go-github-com-google-renameio,
go-github-com-burntsushi-toml, go-mvdan-cc-unparam,
go-honnef-co-go-tools, go-golang-org-x-tools, go-golang-org-x-sync,
go-golang-org-x-mod, go-golang-org-x-exp,
go-github-com-google-go-cmp-cmp, go-github-com-google-go-cmdtest, and
go-github-com-client9-misspell.
[propagated-inputs]: Add go-github-com-google-go-cmdtest,
go-github-com-google-go-cmp-cmp, go-golang-org-x-mod,
go-golang-org-x-exp go-golang-org-x-sync, and go-golang-org-x-tools.

Change-Id: I1155d11eed11aff248cf1c1356048ccffcf57a64
---
 gnu/packages/golang.scm | 49 +++++++++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index dd629ad29c..74ffad3be2 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3160,34 +3160,31 @@ (define-public govulncheck
     ;; XXX: Newer version of govulncheck requires golang.org/x/telemetry,
     ;; which needs to be discussed if it may be included in Guix.
     (version "0.0.0-20230110180137-6ad3e3d07815")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://go.googlesource.com/vuln")
-                    (commit (go-version->git-ref version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1fhz27ni8bs872rgvqq700qacak9v45zy0fh2hilq21sk6dks72r"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/vuln")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1fhz27ni8bs872rgvqq700qacak9v45zy0fh2hilq21sk6dks72r"))))
     (build-system go-build-system)
     (arguments
-     `(#:tests? #f ; it tires to download modules from the network
-       #:install-source? #f
-       #:import-path "golang.org/x/vuln/cmd/govulncheck"
-       #:unpack-path "golang.org/x/vuln"))
-    (native-inputs (list coreutils-minimal))
-    (inputs (list go-golang-org-x-sys
-                  go-github-com-google-renameio
-                  go-github-com-burntsushi-toml
-                  go-mvdan-cc-unparam
-                  go-honnef-co-go-tools
-                  go-golang-org-x-tools
-                  go-golang-org-x-sync
-                  go-golang-org-x-mod
-                  go-golang-org-x-exp
-                  go-github-com-google-go-cmp-cmp
-                  go-github-com-google-go-cmdtest
-                  go-github-com-client9-misspell))
+     (list
+      #:tests? #f ; it tires to download modules from the network
+      #:install-source? #f
+      #:import-path "golang.org/x/vuln/cmd/govulncheck"
+      #:unpack-path "golang.org/x/vuln"))
+    (native-inputs
+     (list coreutils-minimal))
+    (propagated-inputs
+     (list go-github-com-google-go-cmdtest
+           go-github-com-google-go-cmp-cmp
+           go-golang-org-x-exp
+           go-golang-org-x-mod
+           go-golang-org-x-sync
+           go-golang-org-x-tools))
     (home-page "https://golang.org/x/vuln")
     (synopsis "Go Vulnerability Management")
     (description
-- 
cgit v1.2.3


From 5e1b47b8ad5f4a34d810e259737427f4b74d0dc5 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 22:30:14 +0100
Subject: gnu: govulncheck: Swap inheritance with go-golang-org-x-vuln.

Inheritance from source library for final binary build does simplify the
maintenance and readability of the package.  This changes adjust
govulncheck to inherit from go-golang-org-x-vuln.

* gnu/packages/golang.scm (govulncheck): Rename variable to
go-golang-org-x-vuln.
[arguments]: <#:import-path>: Adjust to reflect go.mod. <#:unpack-path>:
Remove it. <#:install-source>: Remove it.
[native-inputs]: Remove coreutils-minimal.
(go-golang-org-x-vuln): Rename variable to govulncheck.
[arguments]: <#:import-path>: Adjust it to reflect go.mod cmd/
path. <#:unpack-path>: Add it. <#:install-source>: Add it.
[native-inputs]: Add coreutils-minimal.

Change-Id: Id78faf00f2b992d36df0c6e2caa72cbacf607aac
---
 gnu/packages/golang.scm | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 74ffad3be2..50805467d1 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3154,9 +3154,9 @@ (define-public go-github-com-tj-docopt
     (home-page "https://github.com/tj/docopt")
     (license license:expat)))
 
-(define-public govulncheck
+(define-public go-golang-org-x-vuln
   (package
-    (name "govulncheck")
+    (name "go-golang-org-x-vuln")
     ;; XXX: Newer version of govulncheck requires golang.org/x/telemetry,
     ;; which needs to be discussed if it may be included in Guix.
     (version "0.0.0-20230110180137-6ad3e3d07815")
@@ -3173,11 +3173,19 @@ (define-public govulncheck
     (arguments
      (list
       #:tests? #f ; it tires to download modules from the network
-      #:install-source? #f
-      #:import-path "golang.org/x/vuln/cmd/govulncheck"
-      #:unpack-path "golang.org/x/vuln"))
-    (native-inputs
-     (list coreutils-minimal))
+      #:import-path "golang.org/x/vuln"
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; XXX: Workaround for go-build-system's lack of Go modules support.
+          (delete 'build)
+          (replace 'check
+            (lambda* (#:key tests? import-path #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion (string-append "src/" import-path)
+                  (invoke "go" "test" "-v"
+                          "./doc/..."
+                          "./internal/..."
+                          "./scan/..."))))))))
     (propagated-inputs
      (list go-github-com-google-go-cmdtest
            go-github-com-google-go-cmp-cmp
@@ -3192,19 +3200,18 @@ (define-public govulncheck
 the @url{https://vuln.go.dev,Go Vulnerability Database}.")
     (license license:bsd-3)))
 
-(define-public go-golang-org-x-vuln
+(define-public govulncheck
   (package
-    (inherit govulncheck)
-    (name "go-golang-org-x-vuln")
+    (inherit go-golang-org-x-vuln)
+    (name "govulncheck")
     (arguments
-     `(#:import-path "golang.org/x/vuln"
-       #:tests? #f
-       #:install-source? #t
-       #:phases (modify-phases %standard-phases
-                  (delete 'build))))
-    (propagated-inputs (package-inputs govulncheck))
-    (native-inputs '())
-    (inputs '())))
+     (list
+      #:tests? #f
+      #:install-source? #f
+      #:import-path "golang.org/x/vuln/cmd/govulncheck"
+      #:unpack-path "golang.org/x/vuln"))
+    (native-inputs
+     (list coreutils-minimal))))
 
 (define-public gopls
   (package
-- 
cgit v1.2.3


From 8b1d7742725aef814118198d26ab097295021189 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 23:08:14 +0100
Subject: gnu: gopls: Update to 0.13.2.

* gnu/packages/golang.scm (gopls): Update to 0.13.2.
[propagated-inputs]: Remove go-github-com-burntsushi-toml,
go-github-com-google-safehtml, and go-golang-org-x-exp; add
go-golang-org-x-tools.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 50805467d1..beafe30e6d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3216,7 +3216,9 @@ (define-public govulncheck
 (define-public gopls
   (package
     (name "gopls")
-    (version "0.12.0")
+    ;; XXX: Starting from 0.14.0 gppls needs golang.org/x/telemetry, which
+    ;; needs to be discussed if it may be included in Guix.
+    (version "0.13.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -3225,7 +3227,7 @@ (define-public gopls
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "04bq7rh6d6mgxm0lsi8y9v1x7cgx4nvjlsyvxl89r6rcqh3n1lfb"))))
+                "1qym2c0xvv6vcgwh0kz8sw094r88lzrl08xpvmg08lrqi00ma6kx"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "golang.org/x/tools/gopls"
@@ -3243,13 +3245,11 @@ (define-public gopls
                              go-golang-org-x-sync
                              go-golang-org-x-sys
                              go-golang-org-x-text
+                             go-golang-org-x-tools
+                             go-golang-org-x-vuln
                              go-gopkg-in-yaml-v3
                              go-honnef-co-go-tools
-                             go-github-com-burntsushi-toml
-                             go-github-com-google-safehtml
-                             go-golang-org-x-exp
                              go-mvdan-cc-gofumpt
-                             go-golang-org-x-vuln
                              go-mvdan-cc-xurls))
     (home-page "https://golang.org/x/tools/gopls")
     (synopsis "Official language server for the Go language")
-- 
cgit v1.2.3


From 1b650288e5646b185eac986f2b6c20c0d8cbbdb1 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 23:11:44 +0100
Subject: gnu: gopls: Adjust package style

* gnu/packages/golang.scm (gopls): Apply new package style, adjust
indentation and swap propagated-inputs to native-inputs.
[propagated-inputs]: Remove go-github-com-google-go-cmp-cmp,
go-github-com-jba-printsrc, go-github-com-jba-templatecheck,
go-github-com-sergi-go-diff, go-golang-org-x-mod, go-golang-org-x-sync,
go-golang-org-x-sys, go-golang-org-x-text, go-golang-org-x-tools,
go-golang-org-x-vuln, go-gopkg-in-yaml-v3, go-honnef-co-go-tools,
go-mvdan-cc-gofumpt, and go-mvdan-cc-xurls.
[native-inputs]: Add go-github-com-google-go-cmp-cmp,
go-github-com-jba-printsrc, go-github-com-jba-templatecheck,
go-github-com-sergi-go-diff, go-golang-org-x-mod, go-golang-org-x-sync,
go-golang-org-x-sys, go-golang-org-x-text, go-golang-org-x-tools,
go-golang-org-x-vuln, go-gopkg-in-yaml-v3, go-honnef-co-go-tools,
go-mvdan-cc-gofumpt, and go-mvdan-cc-xurls.

Change-Id: I1139e19731ea8002835bd14c8592f22ccc79ded3
---
 gnu/packages/golang.scm | 63 ++++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 30 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index beafe30e6d..f81c30b07a 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3219,38 +3219,41 @@ (define-public gopls
     ;; XXX: Starting from 0.14.0 gppls needs golang.org/x/telemetry, which
     ;; needs to be discussed if it may be included in Guix.
     (version "0.13.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://go.googlesource.com/tools")
-                    (commit (string-append "gopls/v" version))))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "1qym2c0xvv6vcgwh0kz8sw094r88lzrl08xpvmg08lrqi00ma6kx"))))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/tools")
+             (commit (string-append "gopls/v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1qym2c0xvv6vcgwh0kz8sw094r88lzrl08xpvmg08lrqi00ma6kx"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "golang.org/x/tools/gopls"
-       #:unpack-path "golang.org/x/tools"
-       #:install-source? #f
-       #:phases (modify-phases %standard-phases
-                  (add-before 'unpack 'override-tools
-                    (lambda _
-                      (delete-file-recursively "src/golang.org/x/tools"))))))
-    (propagated-inputs (list go-github-com-google-go-cmp-cmp
-                             go-github-com-jba-printsrc
-                             go-github-com-jba-templatecheck
-                             go-github-com-sergi-go-diff
-                             go-golang-org-x-mod
-                             go-golang-org-x-sync
-                             go-golang-org-x-sys
-                             go-golang-org-x-text
-                             go-golang-org-x-tools
-                             go-golang-org-x-vuln
-                             go-gopkg-in-yaml-v3
-                             go-honnef-co-go-tools
-                             go-mvdan-cc-gofumpt
-                             go-mvdan-cc-xurls))
+     (list
+      #:install-source? #f
+      #:import-path "golang.org/x/tools/gopls"
+      #:unpack-path "golang.org/x/tools"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'unpack 'override-tools
+            (lambda _
+              (delete-file-recursively "src/golang.org/x/tools"))))))
+    (native-inputs
+     (list go-github-com-google-go-cmp-cmp
+           go-github-com-jba-printsrc
+           go-github-com-jba-templatecheck
+           go-github-com-sergi-go-diff
+           go-golang-org-x-mod
+           go-golang-org-x-sync
+           go-golang-org-x-sys
+           go-golang-org-x-text
+           go-golang-org-x-tools
+           go-golang-org-x-vuln
+           go-gopkg-in-yaml-v3
+           go-honnef-co-go-tools
+           go-mvdan-cc-gofumpt
+           go-mvdan-cc-xurls))
     (home-page "https://golang.org/x/tools/gopls")
     (synopsis "Official language server for the Go language")
     (description
-- 
cgit v1.2.3


From cd7098f9325fadc381adae97e757c8e455390cd0 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sat, 13 Jul 2024 23:50:00 +0100
Subject: gnu: unparam: Update to 0.0.0-20240528143540-8a5130ca722f.

* gnu/packages/golang.scm (unparam): Update to 0.0.0-20240528143540-8a5130ca722f.
[inputs]: Remove go-golang-org-x-sys and go-golang-org-x-mod.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f81c30b07a..2ca32266a2 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8075,7 +8075,7 @@ (define-public go-mvdan-cc-gofumpt
 (define-public unparam
   (package
     (name "unparam")
-    (version "0.0.0-20221223090309-7455f1af531d")
+    (version "0.0.0-20240528143540-8a5130ca722f")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -8084,12 +8084,16 @@ (define-public unparam
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0wynf0b32azxljncw5fh9bwkxpdflvf9q1z16wyj432566yjh12c"))))
+                "0qrwszcmb5slbzkq3acw57b896z22zwkv6cf6ldxwlc6p179g009"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "mvdan.cc/unparam"))
-    (inputs (list go-golang-org-x-sys go-golang-org-x-mod
-                  go-github-com-pkg-diff go-golang-org-x-tools
+     `(;; FIXME: <...>-go-1.21.5/lib/go/src/runtime/cgo/cgo.go:33:8: could not
+       ;; import C (no metadata for C)
+       ;; <...>-go-1.21.5/lib/go/src/net/cgo_linux.go:12:8: could not import C
+       ;; (no metadata for C)
+       #:tests? #f
+       #:import-path "mvdan.cc/unparam"))
+    (inputs (list go-github-com-pkg-diff go-golang-org-x-tools
                   go-github-com-rogpeppe-go-internal))
     (home-page "https://mvdan.cc/unparam/")
     (synopsis "Find unused parameters in Go")
-- 
cgit v1.2.3


From 424c6fe0a2f151a182ad0f18e60be8887e9b4d8b Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 14 Jul 2024 20:04:42 +0100
Subject: gnu: go-github-com-dhowett-go-plist: Update to 1.0.1.

* gnu/packages/golang.scm (go-github-com-dhowett-go-plist): Update to 1.0.1.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 2ca32266a2..da48d02297 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1738,20 +1738,18 @@ (define-public go-github-com-deckarep-golang-set
     (license license:expat)))
 
 (define-public go-github-com-dhowett-go-plist
-  (let ((commit "1454fab16a0642638feb0ae98c41f79eccb2a20a")
-        (revision "1"))
     (package
       (name "go-github-com-dhowett-go-plist")
-      (version (git-version "0.0.0" revision commit))
+      (version "1.0.1")
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
                       (url "https://github.com/DHowett/go-plist")
-                      (commit commit)))
+                      (commit (string-append "v" version))))
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "01c9wmhny2rxywcjipq1xa0xw4qm7yd001239grwxcja3b4n45v8"))))
+                  "1gcrxkmdj87xq01458asgxvvijrkih74ydbzfmir1p16xr9z0x39"))))
       (build-system go-build-system)
       (arguments `(#:import-path "howett.net/plist"))
       (inputs
@@ -1762,7 +1760,7 @@ (define-public go-github-com-dhowett-go-plist
       (description "This list transcoder supports encoding/decoding property
 lists (Apple XML, Apple Binary, OpenStep, and GNUStep) from/to arbitrary Go
 types.")
-      (license license:giftware))))
+      (license license:giftware)))
 
 (define-public go-github-com-blanu-dust
   (package
-- 
cgit v1.2.3


From 226cd42a5ff6cf375dc0b1aa3ab1287fe53e72fc Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 14 Jul 2024 20:09:52 +0100
Subject: gnu: go-github-com-dhowett-go-plist: Improve package style.

* gnu/packages/golang.scm (go-github-com-dhowett-go-plist): Fix
indentation. Apply new style. Swap inputs to propagated-inputs.
[inputs]: Remove go-github-com-jessevdk-go-flags,
go-github-com-kr-pretty, go-gopkg-in-check-v1, and go-gopkg-in-yaml-v2.
[propagated-inputs]: Add go-github-com-jessevdk-go-flags and
go-gopkg-in-check-v1.

Change-Id: I01f2d222b72e9d8d52e0f5c1953d36703d03fb6b
---
 gnu/packages/golang.scm | 48 +++++++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index da48d02297..702c9767d4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1738,29 +1738,31 @@ (define-public go-github-com-deckarep-golang-set
     (license license:expat)))
 
 (define-public go-github-com-dhowett-go-plist
-    (package
-      (name "go-github-com-dhowett-go-plist")
-      (version "1.0.1")
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/DHowett/go-plist")
-                      (commit (string-append "v" version))))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1gcrxkmdj87xq01458asgxvvijrkih74ydbzfmir1p16xr9z0x39"))))
-      (build-system go-build-system)
-      (arguments `(#:import-path "howett.net/plist"))
-      (inputs
-       (list go-github-com-jessevdk-go-flags go-github-com-kr-pretty
-             go-gopkg-in-check-v1 go-gopkg-in-yaml-v2))
-      (home-page "https://github.com/DHowett/go-plist")
-      (synopsis "Apple property list transcoder")
-      (description "This list transcoder supports encoding/decoding property
-lists (Apple XML, Apple Binary, OpenStep, and GNUStep) from/to arbitrary Go
-types.")
-      (license license:giftware)))
+  (package
+    (name "go-github-com-dhowett-go-plist")
+    (version "1.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/DHowett/go-plist")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1gcrxkmdj87xq01458asgxvvijrkih74ydbzfmir1p16xr9z0x39"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "howett.net/plist"))
+    (propagated-inputs
+     (list go-github-com-jessevdk-go-flags
+           go-gopkg-in-check-v1))
+    (home-page "https://github.com/DHowett/go-plist")
+    (synopsis "Apple property list transcoder")
+    (description
+     "This list transcoder supports encoding/decoding property lists (Apple
+XML, Apple Binary, OpenStep, and GNUStep) from/to arbitrary Go types.")
+    (license license:giftware)))
 
 (define-public go-github-com-blanu-dust
   (package
-- 
cgit v1.2.3


From 92382595a412c02aeca00ef3df3b5aeb3a289d5f Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 14 Jul 2024 20:12:05 +0100
Subject: gnu: go-github-com-dhowett-go-plist: Rename variable.

* gnu/packages/golang.scm (go-github-com-dhowett-go-plist): Rename
variable to go-howett-net-plist to reflect go.mod import path.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 702c9767d4..823ff54fee 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1737,9 +1737,9 @@ (define-public go-github-com-deckarep-golang-set
     (description "Set is the set collection for the Go language.")
     (license license:expat)))
 
-(define-public go-github-com-dhowett-go-plist
+(define-public go-howett-net-plist
   (package
-    (name "go-github-com-dhowett-go-plist")
+    (name "go-howett-net-plist")
     (version "1.0.1")
     (source
      (origin
-- 
cgit v1.2.3


From 9abc2e2d4fc581797a26bb3a3ef0f0297f699e87 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 14 Jul 2024 20:15:39 +0100
Subject: gnu: go-github-com-twpayne-go-xdg: Rename variable.

* gnu/packages/golang.scm (go-github-com-twpayne-go-xdg): Rename
variable to go-github-com-twpayne-go-xdg-v3 to reflect go.mod import
path.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 823ff54fee..7d300af7ed 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7344,9 +7344,9 @@ (define-public go-github-com-twpayne-go-vfsafero
 @code{go-github-com-twpayne-go-vfs} and @code{go-github-com-spf13-afero}.")
     (license license:expat)))
 
-(define-public go-github-com-twpayne-go-xdg
+(define-public go-github-com-twpayne-go-xdg-v3
   (package
-    (name "go-github-com-twpayne-go-xdg")
+    (name "go-github-com-twpayne-go-xdg-v3")
     (version "3.1.0")
     (source (origin
               (method git-fetch)
-- 
cgit v1.2.3


From 4bb0b5be20074c53929c175f3fba3a9b56b7e1f6 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 14 Jul 2024 20:25:46 +0100
Subject: gnu: go-github-com-google-go-github: Adjust inputs.

* gnu/packages/golang-web.scm (go-github-com-google-go-github): Swap
native-inputs to propagated-inputs.
[propagated-inputs]: Add go-golang-org-x-oauth2, and
go-golang-org-x-sync.

Change-Id: I3be1b7c0b576e9c6bf5c1efb3904321b6f9d0e7f
---
 gnu/packages/golang-web.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 0fb966ed79..b204280317 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1072,8 +1072,11 @@ (define-public go-github-com-google-go-github
      `(#:tests? #f ;application/octet-stream instead of text/plain
        #:import-path "github.com/google/go-github/v26/github"
        #:unpack-path "github.com/google/go-github/v26"))
-    (native-inputs
-     (list go-github-com-google-go-querystring go-golang-org-x-crypto))
+    (propagated-inputs
+     (list go-github-com-google-go-querystring
+           go-golang-org-x-crypto
+           go-golang-org-x-oauth2
+           go-golang-org-x-sync))
     (home-page "https://github.com/google/go-github/")
     (synopsis "Client library for accessing the GitHub API v3")
     (description "@code{go-github} is a Go client library for accessing the
-- 
cgit v1.2.3


From bfa4c98d38d34b450f98cd6b55f823b4497aeb30 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 14 Jul 2024 20:29:30 +0100
Subject: gnu: go-github-com-zalando-go-keyring: Adjust inputs.

* gnu/packages/golang.scm (go-github-com-zalando-go-keyring): Swap
native-inputs to propagated as the package provides library and all
inputs required to be present when it's in use.

Change-Id: I979d41fd656008ce4ffd8ac2f361e75db782029b
---
 gnu/packages/golang.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 7d300af7ed..97d27d0296 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7622,7 +7622,7 @@ (define-public go-github-com-zalando-go-keyring
     (arguments
      `(#:tests? #f ;XXX: Fix dbus tests
        #:import-path "github.com/zalando/go-keyring"))
-    (native-inputs
+    (propagated-inputs
      (list go-github-com-godbus-dbus dbus))
     (home-page "https://github.com/zalando/go-keyring/")
     (synopsis "Library for working with system keyring")
-- 
cgit v1.2.3


From b4645c95671bc654d92e09f7c712ad3efd100507 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 14 Jul 2024 20:38:13 +0100
Subject: gnu: chezmoi: Fix build.

* gnu/packages/configuration-management.scm (chezmoi): Fix build.
[arguments]: <#:phases>: Add 'copy-input-to-vendor-directory and
'remove-vendor-directory phases.
[native-inputs]: Remove go-github-com-alecthomas-chroma,
go-github-com-aymerick-douceur, go-github-com-chris-ramon-douceur,
go-github-com-danwakefield-fnmatch, go-github-com-dlclark-regexp2,
go-github-com-godbus-dbus, go-github-com-google-go-querystring,
go-github-com-google-goterm, go-github-com-gorilla-css,
go-github-com-lucasb-eyer-go-colorful, go-github-com-mattn-go-isatty,
go-github-com-mattn-go-runewidth,
go-github-com-microcosm-cc-bluemonday, go-github-com-muesli-reflow,
go-github-com-muesli-termenv, go-github-com-olekukonko-tablewriter,
go-github-com-twpayne-go-xdg, go-github-com-yuin-goldmark,
go-golang-org-x-net, and go-gopkg-in-errgo-fmt-errors; add
go-github-com-alecthomas-chroma-v2, go-github-com-stretchr-testify,
go-github-com-twpayne-go-xdg-v3, go-golang-org-x-sys,
go-gopkg-in-yaml-v2, and go-howett-net-plist.

Change-Id: If4baff6d3e927430a4a979ea70cd0c1534acd580
---
 gnu/packages/configuration-management.scm | 58 ++++++++++++++++++++-----------
 1 file changed, 37 insertions(+), 21 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index cded9b0bb8..ffb6762142 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -24,6 +24,7 @@ (define-module (gnu packages configuration-management)
   #:use-module (guix git-download)
   #:use-module (gnu packages golang)
   #:use-module (gnu packages golang-build)
+  #:use-module (gnu packages golang-check)
   #:use-module (gnu packages golang-web)
   #:use-module (gnu packages golang-xyz)
   #:use-module (gnu packages version-control)
@@ -79,48 +80,63 @@ (define-public chezmoi
                           "secretkeepassxc.txt"
                           "secretlastpass.txt"
                           "secretonepassword.txt"
-                          "secretpass.txt")))))))
+                          "secretpass.txt"))))
+          ;; FIXME: Pattern embedded: cannot embed directory embedded:
+          ;; contains no embeddable files.
+          ;;
+          ;; This happens due to Golang can't determine the valid directory of
+          ;; the module which is sourced during setup environment phase, but
+          ;; easy resolved after coping to expected directory "vendor" within
+          ;; the current package, see details in Golang source:
+          ;;
+          ;; - URL: <https://github.com/golang/go/blob/>
+          ;; - commit: 82c14346d89ec0eeca114f9ca0e88516b2cda454
+          ;; - file: src/cmd/go/internal/load/pkg.go#L2059
+          (add-before 'build 'copy-input-to-vendor-directory
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (mkdir "vendor")
+                (copy-recursively
+                 (string-append
+                  #$(this-package-native-input "go-github-com-charmbracelet-glamour")
+                  "/src/github.com")
+                 "vendor/github.com")
+                (copy-recursively
+                 (string-append
+                  #$(this-package-native-input "go-github-com-alecthomas-chroma-v2")
+                  "/src/github.com")
+                 "vendor/github.com"))))
+          (add-before 'install 'remove-vendor-directory
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (delete-file-recursively "vendor")))))))
     (native-inputs
-     (list go-github-com-alecthomas-chroma
-           go-github-com-aymerick-douceur
+     (list go-github-com-alecthomas-chroma-v2
            go-github-com-bmatcuk-doublestar-v2
            go-github-com-charmbracelet-glamour
-           go-github-com-chris-ramon-douceur
            go-github-com-coreos-go-semver
-           go-github-com-danwakefield-fnmatch
-           go-github-com-dlclark-regexp2
-           go-github-com-godbus-dbus
            go-github-com-google-go-github-v33
-           go-github-com-google-go-querystring
-           go-github-com-google-goterm
            go-github-com-google-renameio
-           go-github-com-gorilla-css
-           go-github-com-lucasb-eyer-go-colorful
            go-github-com-masterminds-sprig-v3
-           go-github-com-mattn-go-isatty
-           go-github-com-mattn-go-runewidth
-           go-github-com-microcosm-cc-bluemonday
-           go-github-com-muesli-reflow
-           go-github-com-muesli-termenv
-           go-github-com-olekukonko-tablewriter
            go-github-com-pelletier-go-toml
            go-github-com-pkg-diff
            go-github-com-rogpeppe-go-internal
            go-github-com-sergi-go-diff
            go-github-com-spf13-cobra
            go-github-com-spf13-viper
+           go-github-com-stretchr-testify
            go-github-com-twpayne-go-shell
            go-github-com-twpayne-go-vfs
            go-github-com-twpayne-go-vfsafero
-           go-github-com-twpayne-go-xdg
-           go-github-com-yuin-goldmark
+           go-github-com-twpayne-go-xdg-v3
            go-github-com-zalando-go-keyring
            go-github-go-git
            go-go-etcd-io-bbolt
-           go-golang-org-x-net
            go-golang-org-x-oauth2
+           go-golang-org-x-sys
            go-golang-org-x-term
-           go-gopkg-in-errgo-fmt-errors))
+           go-gopkg-in-yaml-v2
+           go-howett-net-plist))
     (home-page "https://www.chezmoi.io/")
     (synopsis "Personal configuration files manager")
     (description "This package helps to manage personal configuration files
-- 
cgit v1.2.3


From 84118cd1025e77ec06804dfbbfe63869f6417266 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 14 Jul 2024 20:48:45 +0100
Subject: gnu: go-github-com-alecthomas-template: Use go-1.17.

* gnu/packages/golang-xyz.scm (go-github-com-alecthomas-template)
[arguments]: <#:go>: Pin to go-1.17.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 9a85f7399d..9931911e32 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -710,6 +710,10 @@ (define-public go-github-com-alecthomas-template
       (build-system go-build-system)
       (arguments
        (list
+        ;; XXX: Failing on a newer Golang version: FAIL: TestJSEscaping
+        ;; (0.00s) exec_test.go:757: JS escaping [unprintable ﷿] got
+        ;; [unprintable ﷿] want [unprintable \uFDFF]
+        #:go go-1.17
         #:import-path "github.com/alecthomas/template"))
       (home-page "https://github.com/alecthomas/template")
       (synopsis "Fork of Go's text/template adding newline elision")
-- 
cgit v1.2.3


From bf56c9cb8b4b1885f2ed6ca24022cdf363f9f7ef Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 14 Jul 2024 21:17:43 +0100
Subject: gnu: go-github-com-quic-go-qtls-go1-20: Update to 0.4.1.

* gnu/packages/golang-crypto.scm (go-github-com-quic-go-qtls-go1-20): Update to 0.4.1.

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

(limited to 'gnu')

diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index d7d604c04c..3fbeac703b 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -1158,7 +1158,7 @@ (define-public go-github-com-protonmail-go-crypto
 (define-public go-github-com-quic-go-qtls-go1-20
   (package
     (name "go-github-com-quic-go-qtls-go1-20")
-    (version "0.3.4")
+    (version "0.4.1")
     (source
      (origin
        (method git-fetch)
@@ -1167,10 +1167,12 @@ (define-public go-github-com-quic-go-qtls-go1-20
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0fl3yv1w8cygag3lav45vvzb4k9i72p92x13wcq0xn13wxirzirn"))))
+        (base32 "069rknxpg7d0dmxc4akq2mw7wm5bi0420nshykf2iclvmbcg9ajh"))))
     (build-system go-build-system)
     (arguments
      (list
+      ;; XXX: panic: qtls.ClientSessionState doesn't match, with Golang 1.20+.
+      #:go go-1.20
       #:import-path "github.com/quic-go/qtls-go1-20"))
     (propagated-inputs
      (list go-golang-org-x-crypto
-- 
cgit v1.2.3


From 0595f60fa749f44eea392059820dd0da33f2c1de Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Mon, 15 Jul 2024 08:01:27 +0100
Subject: gnu: go-github-com-jhillyerd-enmime: Update to 1.2.0.

* gnu/packages/golang.scm (go-github-com-jhillyerd-enmime): Update to 1.2.0.
[propagated-inputs]: Remove go-golang-org-x-net, go-github-com-stretchr-testify,
go-github-com-ssor-bom, go-github-com-rivo-uniseg,
go-github-com-olekukonko-tablewriter, and
go-github-com-mattn-go-runewidth.
[native-inputs]: Add go-github-com-stretchr-testify.

Change-Id: I9e5d16f0547732263e9fcf8a75b95a97c9d4a2df
---
 gnu/packages/golang.scm | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 97d27d0296..ffe2e35975 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9026,7 +9026,7 @@ (define-public go-github-com-jaytaylor-html2text
 (define-public go-github-com-jhillyerd-enmime
   (package
     (name "go-github-com-jhillyerd-enmime")
-    (version "0.9.4")
+    (version "1.2.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -9035,22 +9035,19 @@ (define-public go-github-com-jhillyerd-enmime
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "124dqm598phbmalyx2gmxk201z9kq4ckvvdq8rc0akjlp24nxqbb"))))
+                "03pir9wq9ha2i2ifj819yv5i0lvrgdn904ksbzgc3k8bqc497ydn"))))
     (build-system go-build-system)
     (arguments
      (list #:import-path "github.com/jhillyerd/enmime"))
-    (propagated-inputs (list go-golang-org-x-text
-                             go-golang-org-x-net
-                             go-github-com-stretchr-testify
-                             go-github-com-ssor-bom
-                             go-github-com-rivo-uniseg
-                             go-github-com-pkg-errors
-                             go-github-com-olekukonko-tablewriter
-                             go-github-com-mattn-go-runewidth
-                             go-github-com-gogs-chardet
-                             go-github-com-jaytaylor-html2text
-                             go-github-com-go-test-deep
-                             go-github-com-cention-sany-utf7))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs (list
+                        go-github-com-cention-sany-utf7
+                        go-github-com-go-test-deep
+                        go-github-com-gogs-chardet
+                        go-github-com-jaytaylor-html2text
+                        go-github-com-pkg-errors
+                        go-golang-org-x-text))
     (home-page "https://github.com/jhillyerd/enmime")
     (synopsis "MIME encoder and decoder for Go")
     (description
-- 
cgit v1.2.3


From 3e656b6354b7f374c1f8c874a33e4193690b27ff Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Mon, 15 Jul 2024 10:59:25 +0100
Subject: gnu: restic: Use go-1.17.

* gnu/packages/backup.scm (restic): [arguments]: <#:go>: Pin to go-1.17.

Change-Id: I63267c2bdb3e983475cf75b285021c71ac578e1a
---
 gnu/packages/backup.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'gnu')

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 637a873fbf..19c261ea82 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -952,7 +952,11 @@ (define-public restic
                (search-patches "restic-0.9.6-fix-tests-for-go1.15.patch"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "github.com/restic/restic"
+     `(;; XXX: Tests failed on a newer version of Golang, newer version of
+       ;; restic does not provide vendor folder any longer which means - a
+       ;; long way of packaging missing inputs.
+       #:go ,go-1.17
+       #:import-path "github.com/restic/restic"
       ;; We don't need to install the source code for end-user applications.
        #:install-source? #f
        #:phases
-- 
cgit v1.2.3


From b88045ec9144a37ce90e178bede80ae6c9b7f900 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Mon, 15 Jul 2024 11:08:06 +0100
Subject: gnu: go-pgregory-net-rapid: Use go-1.18.

* gnu/packages/golang-check.scm (go-pgregory-net-rapid): [arguments]:
<#:go>: Pin to go-1.18.

Change-Id: Ibecbf2465964796f2ef9b7bd832f3db727b3d446
---
 gnu/packages/golang-check.scm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gnu')

diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm
index b3c5286a72..0822338943 100644
--- a/gnu/packages/golang-check.scm
+++ b/gnu/packages/golang-check.scm
@@ -1375,6 +1375,7 @@ (define-public go-pgregory-net-rapid
     (build-system go-build-system)
     (arguments
      (list
+      #:go go-1.18
       #:import-path "pgregory.net/rapid"))
     (home-page "https://pgregory.net/rapid/")
     (synopsis "Go property-based testing library")
-- 
cgit v1.2.3


From a2b102257d1adcc532b2c66ffb13deb075c2f55d Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Mon, 15 Jul 2024 11:30:53 +0100
Subject: gnu: trezord: Use go-1.18.

* gnu/packages/finance.scm (trezord): [arguments]: <#:go>: Pin to
go-1.18.

Change-Id: I000c5ff0755bd247ae9311bb2c171404f751be99
---
 gnu/packages/finance.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'gnu')

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 3505364c00..29186fec88 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -1690,7 +1690,8 @@ (define-public trezord
        (file-name (git-file-name name version))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "github.com/trezor/trezord-go"))
+     `(#:go ,go-1.18
+       #:import-path "github.com/trezor/trezord-go"))
     (native-inputs
      (list go-github-com-gorilla-csrf
            go-github-com-gorilla-handlers
-- 
cgit v1.2.3


From 5592cd9d5b94c50a497a44012949dff5fc0f7d1a Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Mon, 15 Jul 2024 12:10:42 +0100
Subject: gnu: demlo: Update to 3.8-1.985f810.

* gnu/packages/music.scm (demlo): Update to 3.8-1.985f810.
[arguments]: <#:go>: Pin to go-1.17.

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

(limited to 'gnu')

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 16d16b1571..aba82a387e 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6127,8 +6127,8 @@ (define-public clyrics
     (license license:gpl3+)))
 
 (define-public demlo
-  (let ((commit "fe9ec4c8ac2fa995ec18e6ac86d50d46df06ec01")
-        (revision "0"))
+  (let ((commit "985f81047a67c795e67f628b550064558476a7c3")
+        (revision "1"))
     (package
       (name "demlo")
       (version (git-version "3.8" revision commit))
@@ -6142,7 +6142,7 @@ (define-public demlo
          (file-name (git-file-name name version))
          (sha256
           (base32
-           "1afkbqhzn6da7zaf5ab7dvyqj1izqhzprwfb4hw448fllda9bdvk"))))
+           "1wx7pwgvg1fiq55jdc22353frcdlz548g97dy4j353lqxy8vxfyj"))))
       (build-system go-build-system)
       (native-inputs
        (list lua
@@ -6157,7 +6157,8 @@ (define-public demlo
       (inputs
        (list chromaprint ffmpeg))
       (arguments
-       `(#:import-path "gitlab.com/ambrevar/demlo"
+       `(#:go ,go-1.17
+         #:import-path "gitlab.com/ambrevar/demlo"
          #:phases
          (modify-phases %standard-phases
            (add-after 'install 'wrap-program
-- 
cgit v1.2.3


From 293b3260623d4bf7fb0798397fce2d4b8e09b68a Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Mon, 15 Jul 2024 12:17:28 +0100
Subject: gnu: Remove go-github-com-aswinkarthik-csvdiff.

* gnu/packages/textutils.scm (go-github-com-aswinkarthik-csvdiff): Delete variable.

Change-Id: I582399e8decbe82445b82d3e69dceeb743829ee4
---
 gnu/packages/textutils.scm | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 5510383d0c..d515b62c0a 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1562,9 +1562,6 @@ (define-public csvdiff
 @end itemize")
     (license license:expat)))
 
-(define-public go-github-com-aswinkarthik-csvdiff
-  (deprecated-package "go-github-com-aswinkarthik-csvdiff" csvdiff))
-
 (define-public miller
   (package
     (name "miller")
-- 
cgit v1.2.3


From eae0865f96c081eebad2fd57277641f1f9e6b45b Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Mon, 15 Jul 2024 12:17:29 +0100
Subject: gnu: Remove go-github-com-errata-ai-vale.

* gnu/packages/textutils.scm (go-github-com-errata-ai-vale): Delete variable.

Change-Id: I457b50a280481792804e1a45703ac55b482e5029
---
 gnu/packages/textutils.scm | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index d515b62c0a..39205f3784 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1484,9 +1484,6 @@ (define-public vale
 @url{https://github.com/errata-ai/styles, their styles repo}.")
     (license license:expat)))
 
-(define-public go-github-com-errata-ai-vale
-  (deprecated-package "go-github-com-errata-ai-vale" vale))
-
 (define-public utf-8-lineseparator
   (package
     (name "utf-8-lineseparator")
-- 
cgit v1.2.3


From d537b61974d3366dbe36da6336510e0fae2cc780 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Mon, 15 Jul 2024 12:17:29 +0100
Subject: gnu: Remove go-github-com-go-libsecret.

* gnu/packages/golang.scm (go-github-com-go-libsecret): Delete variable.

Change-Id: I13d99d7ab772ccd120dc8ab34f11b18d981a3301
---
 gnu/packages/golang.scm | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ffe2e35975..fa8d4676f6 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8625,9 +8625,6 @@ (define-public go-github-com-gsterjov-go-libsecret
       (home-page "https://github.com/gsterjov/go-libsecret")
       (license license:expat))))
 
-(define-public go-github-com-go-libsecret
-  (deprecated-package "go-github-com-go-libsecret" go-github-com-gsterjov-go-libsecret))
-
 (define-public go-github-com-mtibben-androiddnsfix
   (let ((commit "ff02804463540c36e3a148dcf4b009d003cf2a31")
         (revision "0"))
-- 
cgit v1.2.3


From 85dce5e01cbb71dd2a88334635f14080c5d4100b Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Mon, 15 Jul 2024 12:17:29 +0100
Subject: gnu: Remove go-github-com-percent.

* gnu/packages/golang.scm (go-github-com-percent): Delete variable.

Change-Id: I053f14dbec325f9c1811ad51cfff4bf4a2502942
---
 gnu/packages/golang.scm | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index fa8d4676f6..bfbdd5d873 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8516,9 +8516,6 @@ (define-public go-github-com-mtibben-percent
     (home-page "https://github.com/mtibben/percent")
     (license license:expat)))
 
-(define-public go-github-com-percent
-  (deprecated-package "go-github-com-percent" go-github-com-mtibben-percent))
-
 (define-public aws-vault
   (package
     (name "aws-vault")
-- 
cgit v1.2.3


From f36d9814948cd8f89958a1d4f2f9bf7e16d0ddf8 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Mon, 15 Jul 2024 12:17:29 +0100
Subject: gnu: Remove go-github-com-willf-bloom.

* gnu/packages/golang.scm (go-github-com-willf-bloom): Delete variable.

Change-Id: I635a07e12a4b6d245ae86867f9b21150571e7e36
---
 gnu/packages/golang.scm | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index bfbdd5d873..c43ef2ea94 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6385,9 +6385,6 @@ (define-public go-github-com-bits-and-blooms-bloom
     (home-page "https://github.com/bits-and-blooms/bitset")
     (license license:bsd-2)))
 
-(define-public go-github-com-willf-bloom
-  (deprecated-package "go-github-com-willf-bloom" go-github-com-bits-and-blooms-bloom))
-
 (define-public go-golang-org-rainycape-unidecode
   (let ((commit "cb7f23ec59bec0d61b19c56cd88cee3d0cc1870c")
         (revision "1"))
-- 
cgit v1.2.3


From 973f3bd810f0f2a3297d25871550407fa91f7956 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Mon, 15 Jul 2024 12:17:29 +0100
Subject: gnu: Remove go-github-com-willf-bitset.

* gnu/packages/golang.scm (go-github-com-willf-bitset): Delete variable.

Change-Id: Ic6a7d8d8dcfedb268d76fa46278818dddcb99e6b
---
 gnu/packages/golang.scm | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index c43ef2ea94..889fb054ce 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6348,9 +6348,6 @@ (define-public go-github-com-bits-and-blooms-bitset
     (home-page "https://github.com/bits-and-blooms/bitset")
     (license license:bsd-3)))
 
-(define-public go-github-com-willf-bitset
-  (deprecated-package "go-github-com-willf-bitset" go-github-com-bits-and-blooms-bitset))
-
 (define-public go-github-com-bits-and-blooms-bloom
   (package
     (name "go-github-com-bits-and-blooms-bloom")
-- 
cgit v1.2.3


From 3e1fd3972aceaea22b3be1ffe75ef549a3694f07 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Mon, 15 Jul 2024 12:17:29 +0100
Subject: gnu: Remove go-golang-org-colorful.

* gnu/packages/golang.scm (go-golang-org-colorful): Delete variable.

Change-Id: I135fead7fdc01f293756a798dbd9b19897e74c06
---
 gnu/packages/golang.scm | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 889fb054ce..3ea153978f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5325,9 +5325,6 @@ (define-public go-github-com-lucasb-eyer-go-colorful
 various color spaces.")
     (license license:expat)))
 
-(define-public go-golang-org-colorful
-  (deprecated-package "go-golang-org-colorful" go-github-com-lucasb-eyer-go-colorful))
-
 (define-public go-github-com-gdamore-encoding
   (package
     (name "go-github-com-gdamore-encoding")
-- 
cgit v1.2.3