[bug#60899] [PATCH 00/25] gnu: golang: Add gopls

[bug#60899] [PATCH 00/25] gnu: golang: Add gopls

[Katherine Cox-Buday]

This is a patch series to add the gopls package.

I haven't contributed to many projects which use the e-mail flow, so hopefully
I'm doing this correctly. Please feel free to make suggestions if not!

Some of the diffs are a little busier than I'd like for version bumps. This is
due to running `guix style` over everything.

For all of the packages I have:

. Run guix style
. Run guix lint
. Built 2x
. Checked that the change is in the correct branch
. Built all dependencies
. Built the repository

Katherine Cox-Buday (25):
  gnu: go-golang-org-x-sync: Update to 0.1.0-1.8fcdb60.
  gnu: go-golang-org-x-mod: Update to 0.7.0.
  gnu: Add go-golang-org-x-exp.
  gnu: Add go-github-com-jba-printsrc.
  gnu: Add go-github-com-google-safehtml.
  gnu: Add go-github-com-jba-templatecheck.
  gnu: go-github-com-google-go-cmp-cmp: Update to 0.5.9.
  gnu: go-github-com-pkg-diff: Update to
    0.0.0-20210226163009-20ebb0f2a09e.
  gnu: go-github-com-rogpeppe-go-internal: Update to 1.9.0.
  gnu: gopkg-in-errgo-fmt-errors: Rename package to
    go-gopkg-in-errgo-fmt-errors.
  gnu: go-golang-org-x-tools: Update to 0.5.0.
  gnu: Add xurls.
  gnu: Add go-mvdan-cc-xurls.
  gnu: Add misspell.
  gnu: Add go-github-com-client9-misspell.
  gnu: Add go-github-com-google-go-cmdtest.
  gnu: Add unparam.
  gnu: Add go-mvdan-cc-unparam.
  gnu: Add govulncheck.
  gnu: Add go-golang-org-x-vuln.
  gnu: go-github-com-burntsushi-toml: Update to 1.2.1.
  gnu: go-honnef-co-go-tools: Update to 0.3.3.
  gnu: Add gofumpt.
  gnu: Add go-mvdan-cc-gofumpt.
  gnu: Add gopls.

 gnu/packages/configuration-management.scm |   2 +-
 gnu/packages/golang.scm                   | 695 ++++++++++++++++++----
 2 files changed, 578 insertions(+), 119 deletions(-)


base-commit: 5c921977179489caef4a9e54ada6696fc86d2f0b
-- 
2.38.1

[bug#60903] [PATCH 01/25] gnu: go-golang-org-x-sync: Update to 0.1.0-1.8fcdb60.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-golang-org-x-sync): Update to 0.1.0-1.8fcdb60.
---
 gnu/packages/golang.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 70ddef52f1..9300e675dd 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
 ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
-;;; Copyright © 2018, 2019, 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
+;;; Copyright © 2018, 2019, 2020, 2023 Katherine Cox-Buday <cox.katherine.e@gmail.com>
 ;;; Copyright © 2019 Giovanni Biscuolo <g@xelera.eu>
 ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2019, 2020, 2021 Arun Isaac <arunisaac@systemreboot.net>
@@ -3021,11 +3021,11 @@ (define-public go-golang-org-x-image
       (license license:bsd-3))))
 
 (define-public go-golang-org-x-sync
-  (let ((commit "6e8e738ad208923de99951fe0b48239bfd864f28")
+  (let ((commit "8fcdb60fdcc0539c5e357b2308249e4e752147f1")
         (revision "1"))
     (package
       (name "go-golang-org-x-sync")
-      (version (git-version "0.0.0" revision commit))
+      (version (git-version "0.1.0" revision commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -3034,17 +3034,17 @@ (define-public go-golang-org-x-sync
                 (file-name (git-file-name name version))
                 (sha256
                  (base32
-                  "1avk27pszd5l5df6ff7j78wgla46ir1hhy2jwfl9a3c0ys602yx9"))))
+                  "07qrhni6f5hh5p95k1yk6s4wsj341q663irvx6rllrxfsymj6a0z"))))
       (build-system go-build-system)
       (arguments
        `(#:import-path "golang.org/x/sync"
          #:tests? #f
          ;; Source-only package
-         #:phases
-         (modify-phases %standard-phases
-           (delete 'build))))
+         #:phases (modify-phases %standard-phases
+                    (delete 'build))))
       (synopsis "Additional Go concurrency primitives")
-      (description "This package provides Go concurrency primitives in addition
+      (description
+       "This package provides Go concurrency primitives in addition
 to the ones provided by the language and “sync” and “sync/atomic”
 packages.")
       (home-page "https://go.googlesource.com/sync/")
-- 
2.38.1

[bug#60898] [PATCH 02/25] gnu: go-golang-org-x-mod: Update to 0.7.0.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-golang-org-x-mod): Update to 0.7.0.
---
 gnu/packages/golang.scm | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 9300e675dd..5e7fd1fa82 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3190,28 +3190,27 @@ (define-public go-golang-org-x-xerrors
       (license license:bsd-3))))
 
 (define-public go-golang-org-x-mod
-  (let ((commit "0f08993efd8a8ec67e75bcccf86b0e1569b0ab0a")
+  (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1")
         (revision "0"))
     (package
       (name "go-golang-org-x-mod")
-      (version (git-version "0.5.0" revision commit))
-      (source
-       (origin
-         (method git-fetch)
-         (uri (git-reference
-               (url "https://github.com/golang/mod")
-               (commit commit)))
-         (file-name (git-file-name name version))
-         (sha256
-          (base32 "0pl0jc5jvg7hxj4z66zg6kglnq5g7li09f3k9klwvyr4jx5dw88k"))))
+      (version (git-version "0.7.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/golang/mod")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "14r24fq3kn84k2y2jvvg8hwpy52a3q429pimrdwl5zwknbr2awmh"))))
       (build-system go-build-system)
       (arguments
        '(#:import-path "golang.org/x/mod/"
          #:tests? #f
-         #:phases
-         (modify-phases %standard-phases
-           ;; Source-only package
-           (delete 'build))))
+         #: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
-- 
2.38.1

[bug#60901] [PATCH 03/25] gnu: Add go-golang-org-x-exp.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-golang-org-x-exp): New variable.
---
 gnu/packages/golang.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5e7fd1fa82..861640435e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -2855,6 +2855,33 @@ (define-public go-github-com-hashicorp-hcl-v2
     (home-page "https://github.com/hashicorp/hcl")
     (license license:mpl2.0)))
 
+(define-public go-golang-org-x-exp
+  (package
+    (name "go-golang-org-x-exp")
+    (version "0.0.0-20221004215720-b9f4876ce741")
+    (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
+                "030b929xyg8dpp6f4qbyg63msi6zgzj9sqmvnyphfcrjkqf7nr41"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "golang.org/x/exp"
+       ;; Source-only package
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (delete 'build))))
+    (home-page "https://golang.org/x/exp")
+    (synopsis "Experimental and deprecated Go packages")
+    (description
+     "This subrepository holds experimental and deprecated (in the @code{old}
+directory) packages.")
+    (license license:bsd-3)))
+
 (define-public go-golang-org-x-tools
   (let ((commit "8b927904ee0dec805c89aaf9172f4459296ed6e8")
         (revision "0"))
-- 
2.38.1

[bug#60900] [PATCH 04/25] gnu: Add go-github-com-jba-printsrc.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-github-com-jba-printsrc): New variable.
---
 gnu/packages/golang.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 861640435e..677d58d831 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8515,6 +8515,32 @@ (define-public go-github-com-go-git-go-billy
 file system operations.")
     (license license:asl2.0)))
 
+(define-public go-github-com-jba-printsrc
+  (package
+    (name "go-github-com-jba-printsrc")
+    (version "0.2.2")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/jba/printsrc")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1gyy3kmb5a5i710wkv3b7ah7i7sz5sdc7v3sab5m4rxch1sd2fpj"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/jba/printsrc"
+       ;; TODO: Open bug; expecting time.Local, but when local=UTC, we get time.UTC
+       #:tests? #f))
+    (home-page "https://github.com/jba/printsrc")
+    (synopsis "Prints Go values as sourcecode")
+    (description
+     "Package printsrc prints Go values as Go source.  It strives to render
+legal Go source code, and returns an error when detects that it cannot.")
+    ;; MIT
+    (license license:expat)))
+
 (define-public go-github-com-jbenet-go-context
   (let ((commit "d14ea06fba99483203c19d92cfcd13ebe73135f4")
         (revision "1"))
-- 
2.38.1

[bug#60904] [PATCH 05/25] gnu: Add go-github-com-google-safehtml.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-github-com-google-safehtml): New variable.
---
 gnu/packages/golang.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 677d58d831..9f7a8160de 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10921,6 +10921,31 @@ (define-public go-github-com-google-go-jsonnet
 implementation.")
     (license license:asl2.0)))
 
+(define-public go-github-com-google-safehtml
+  (package
+    (name "go-github-com-google-safehtml")
+    (version "0.1.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/google/safehtml")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0j2xjy8xrk9y9k6bqpvimj84i6hg1wwsyvwsb0axhmp49cmnrp86"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/google/safehtml"))
+    (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text)))
+    (home-page "https://github.com/google/safehtml")
+    (synopsis "Safe HTML for Go")
+    (description
+     "Package safehtml provides immutable string-like types which represent values
+that are guaranteed to be safe, by construction or by escaping or sanitization,
+to use in various HTML contexts and with various DOM APIs.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-google-shlex
   (package
     (name "go-github-com-google-shlex")
-- 
2.38.1

[bug#60902] [PATCH 06/25] gnu: Add go-github-com-jba-templatecheck.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-github-com-jba-templatecheck): New variable.
---
 gnu/packages/golang.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 9f7a8160de..aabaa6336c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8541,6 +8541,33 @@ (define-public go-github-com-jba-printsrc
     ;; MIT
     (license license:expat)))
 
+(define-public go-github-com-jba-templatecheck
+  (package
+    (name "go-github-com-jba-templatecheck")
+    (version "0.6.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/jba/templatecheck")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "12iwkidz4p6wdl65jfddqxls80mv879k2rpb42dj7y4dja5advlc"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/jba/templatecheck"))
+    (propagated-inputs (list go-github-com-google-safehtml))
+    (home-page "https://github.com/jba/templatecheck")
+    (synopsis "Checks Go templates for problems")
+    (description
+     "Package templatecheck checks Go templates for problems.  It can detect
+many errors that are normally caught only during execution.  Use templatecheck
+in tests to find template errors early, and along template execution paths
+that might only rarely be reached.")
+    ;; MIT
+    (license license:expat)))
+
 (define-public go-github-com-jbenet-go-context
   (let ((commit "d14ea06fba99483203c19d92cfcd13ebe73135f4")
         (revision "1"))
-- 
2.38.1

[bug#60907] [PATCH 07/25] gnu: go-github-com-google-go-cmp-cmp: Update to 0.5.9.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-github-com-google-go-cmp-cmp): Update to 0.5.9.
---
 gnu/packages/golang.scm | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index aabaa6336c..9554234c7b 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7024,28 +7024,27 @@ (define-public go-github-com-fatih-color
 (define-public go-github-com-google-go-cmp-cmp
   (package
     (name "go-github-com-google-go-cmp-cmp")
-    (version "0.5.2")
+    (version "0.5.9")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/google/go-cmp")
-                     (commit (string-append "v" version))))
+                    (url "https://github.com/google/go-cmp")
+                    (commit (string-append "v" version))))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0qchy411jm9q2l9mf7x3ry2ycaqp9xdhf2nx14qrpzcxfigv2705"))))
+                "0a13m7l1jrysa7mrlmra8y7n83zcnb23yjyg3a609p8i9lxkh1wm"))))
     (build-system go-build-system)
     (arguments
      '(#:import-path "github.com/google/go-cmp/cmp"
        #:unpack-path "github.com/google/go-cmp"))
-    (propagated-inputs
-     (list go-golang-org-x-xerrors))
     (synopsis "Determine equality of values in Go")
-    (description "This package provides a more powerful and safer
-alternative to @code{reflect.DeepEqual} for comparing whether two values
-are semantically equal in Go (for writing tests).")
-    (home-page "https://godoc.org/github.com/google/go-cmp/cmp")
-    (license license:asl2.0)))
+    (description
+     "This package is intended to be a more powerful and safer
+alternative to @@code{reflect.DeepEqual} for comparing whether two values are
+semantically equal.")
+    (home-page "https://github.com/google/go-cmp")
+    (license license:bsd-3)))
 
 (define-public go-github-com-google-uuid
   (package
-- 
2.38.1

[bug#60905] [PATCH 08/25] gnu: go-github-com-pkg-diff: Update to 0.0.0-20210226163009-20ebb0f2a09e.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-github-com-pkg-diff): Update to 0.0.0-20210226163009-20ebb0f2a09e.
---
 gnu/packages/golang.scm | 44 +++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 9554234c7b..5e8159975f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8736,30 +8736,26 @@ (define-public go-github-com-go-git-go-git-fixtures
     (license license:asl2.0)))
 
 (define-public go-github-com-pkg-diff
-  (let ((commit "531926345625d489a6b56f860a569e68245ace36")
-        (revision "1"))
-    (package
-      (name "go-github-com-pkg-diff")
-      (version (git-version "0.0.1" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://github.com/pkg/diff")
-                      (commit commit)))
-                (file-name (git-file-name name version))
-                (sha256
-                 (base32
-                  "1770m7qhww6lm0wj1v3mhv6hwa2v92p4w2fqxj1xyrg5dd58d944"))))
-      (build-system go-build-system)
-      (arguments
-       `(#:import-path "github.com/pkg/diff"))
-      (native-inputs
-       (list go-github-com-sergi-go-diff))
-      (home-page "https://github.com/pkg/diff/")
-      (synopsis "Create and print diffs")
-      (description
-       "This package provides a Go library to create and print diffs.")
-      (license license:bsd-3))))
+  (package
+    (name "go-github-com-pkg-diff")
+    (version "0.0.0-20210226163009-20ebb0f2a09e")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/pkg/diff")
+                    (commit "20ebb0f2a09e612109b224b32f79370409108bcc")))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1g3dzgwhz4fx3ddpsv7fsa4r1v5clsp2lbw2qrkdk9y1vc5gi8yi"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "github.com/pkg/diff"))
+    (home-page "https://github.com/pkg/diff/")
+    (synopsis "Create and print diffs")
+    (description
+     "This package provides a Go library to create and print diffs.")
+    (license license:bsd-3)))
 
 (define-public go-github-com-twpayne-go-shell
   (package
-- 
2.38.1

[bug#60906] [PATCH 09/25] gnu: go-github-com-rogpeppe-go-internal: Update to 1.9.0.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-github-com-rogpeppe-go-internal): Update to 1.9.0.
---
 gnu/packages/golang.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5e8159975f..240f8ea56c 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9104,7 +9104,7 @@ (define-public go-filippo-io-edwards25519
 (define-public go-github-com-rogpeppe-go-internal
   (package
     (name "go-github-com-rogpeppe-go-internal")
-    (version "1.6.1")
+    (version "1.9.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -9113,7 +9113,7 @@ (define-public go-github-com-rogpeppe-go-internal
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "00j2vpp1bsggdvw1winkz23mg0q6drjiir5q0k49pmqx1sh7106l"))))
+                "0bh08k8fy1qcc0vzyv0xkg0sx5kjx348zd1dpjmp3rbrr6xrpaaw"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "github.com/rogpeppe/go-internal"
@@ -9122,6 +9122,8 @@ (define-public go-github-com-rogpeppe-go-internal
        #:phases
        (modify-phases %standard-phases
          (delete 'build))))
+    (propagated-inputs
+     (list go-github-com-pkg-diff))
     (home-page "https://github.com/rogpeppe/go-internal/")
     (synopsis "Internal packages from the Go standard library")
     (description "This repository factors out an opinionated selection of
-- 
2.38.1

[bug#60908] [PATCH 10/25] gnu: gopkg-in-errgo-fmt-errors: Rename package to go-gopkg-in-errgo-fmt-errors.

[Katherine Cox-Buday]

* gnu/packages/configuration-management.scm (chezmoi): Define in terms
of'go-gopkg-in-errgo-fmt-errors'.

* (go-gopkg-in-errgo-fmt-errors): New variable, formerly known as "gopkg-in-errgo-fmt-errors".
---
 gnu/packages/configuration-management.scm | 2 +-
 gnu/packages/golang.scm                   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index 3ebb6957c8..b66f70545a 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -97,7 +97,7 @@ (define-public chezmoi
            go-golang-org-x-net
            go-golang-org-x-oauth2
            go-github-com-rogpeppe-go-internal
-           gopkg-in-errgo-fmt-errors))
+           go-gopkg-in-errgo-fmt-errors))
     (home-page "https://www.chezmoi.io/")
     (synopsis "Personal configuration files manager")
     (description "This package helps to manage personal configuration files
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 240f8ea56c..4cef0f61f6 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9147,9 +9147,9 @@ (define-public go-github-com-rogpeppe-go-internal
 @end itemize\n")
     (license license:bsd-3)))
 
-(define-public gopkg-in-errgo-fmt-errors
+(define-public go-gopkg-in-errgo-fmt-errors
   (package
-    (name "gopkg-in-errgo-fmt-errors")
+    (name "go-gopkg-in-errgo-fmt-errors")
     (version "2.1.0")
     (source (origin
               (method git-fetch)
@@ -9162,7 +9162,7 @@ (define-public gopkg-in-errgo-fmt-errors
                 "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2"))))
     (build-system go-build-system)
     (arguments
-     `(#:import-path "gopkg.in/errgo.v2/fmt/errors"
+     `(#:import-path "gopkg.in/errgo.v2"
        #:tests? #f
        ;; Source-only package
        #:phases
-- 
2.38.1

[bug#60909] [PATCH 11/25] gnu: go-golang-org-x-tools: Update to 0.5.0.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-golang-org-x-tools): Update to 0.5.0.
---
 gnu/packages/golang.scm | 64 ++++++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4cef0f61f6..aa5f5ba159 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -2883,35 +2883,45 @@ (define-public go-golang-org-x-exp
     (license license:bsd-3)))
 
 (define-public go-golang-org-x-tools
-  (let ((commit "8b927904ee0dec805c89aaf9172f4459296ed6e8")
-        (revision "0"))
-    (package
-      (name "go-golang-org-x-tools")
-      (version (git-version "0.1.3" revision commit))
-      (source (origin
-                (method git-fetch)
-                (uri (git-reference
-                      (url "https://go.googlesource.com/tools")
-                      (commit commit)))
-                (file-name (string-append "go.googlesource.com-tools-"
-                                          version "-checkout"))
-                (sha256
-                 (base32
-                  "0iinb70xhcjsddgi42ia1n745lx2ibnjdm6m2v666qrk3876vpck"))))
-      (build-system go-build-system)
-      (arguments
-       `(#:import-path "golang.org/x/tools"
+  (package
+    (name "go-golang-org-x-tools")
+    (version "0.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/tools")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "08kx2nndq3sr6xai7403mbsqvz5shxmp2icylfr2fmwagr59cb2n"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; gopls versions are tagged separately, and it is a
+           ;; separate Guix package.
+           (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
-         #:tests? #f
-         #:phases
-         (modify-phases %standard-phases
-           ;; Source-only package
-           (delete 'build))))
-      (synopsis "Tools that support the Go programming language")
-      (description "This package provides miscellaneous tools that support the
+         (delete 'build))))
+    (propagated-inputs
+     (list
+      go-github-com-yuin-goldmark
+      go-golang-org-x-mod
+      go-golang-org-x-net
+      go-golang-org-x-sys))
+    (synopsis "Tools that support the Go programming language")
+    (description "This package provides miscellaneous tools that support the
 Go programming language.")
-      (home-page "https://go.googlesource.com/tools/")
-      (license license:bsd-3))))
+    (home-page "https://go.googlesource.com/tools/")
+    (license license:bsd-3)))
 
 (define-public go-golang-org-x-crypto
   (let ((commit "2aa609cf4a9d7d1126360de73b55b6002f9e052a")
-- 
2.38.1

[bug#60910] [PATCH 12/25] gnu: Add xurls.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (xurls): New variable.
---
 gnu/packages/golang.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index aa5f5ba159..cabc2a4bab 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9760,6 +9760,38 @@ (define-public go-go-uber-org-multierr
      "@code{multierr} allows combining one or more Go errors together.")
     (license license:expat)))
 
+(define-public xurls
+  (package
+    (name "xurls")
+    (version "2.4.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/mvdan/xurls")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0b040nbk1vwlk1qljavh8w8fn2r243q700n6gr8j2asmnz0xq84p"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "mvdan.cc/xurls/v2"
+       #:unpack-path "mvdan.cc/xurls/v2"
+       #:phases (modify-phases %standard-phases
+                  (replace 'build
+                    (lambda arguments
+                      (apply (assoc-ref %standard-phases
+                                        'build)
+                             `(,@arguments #:import-path
+                               "mvdan.cc/xurls/v2/cmd/xurls")))))))
+    (inputs (list go-golang-org-x-sync go-github-com-rogpeppe-go-internal))
+    (home-page "https://mvdan.cc/xurls/v2/")
+    (synopsis "Extracts URLs from text")
+    (description
+     "Xurls extracts urls from plain text using regular expressions.  It can
+be used as both a binary and a library.")
+    (license license:bsd-3)))
+
 (define-public go-golang-org-x-lint
   (let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445")
         (revision "0"))
-- 
2.38.1

[bug#60911] [PATCH 13/25] gnu: Add go-mvdan-cc-xurls.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-mvdan-cc-xurls): New variable.
---
 gnu/packages/golang.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index cabc2a4bab..2b778ac49e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9792,6 +9792,20 @@ (define-public xurls
 be used as both a binary and a library.")
     (license license:bsd-3)))
 
+(define-public go-mvdan-cc-xurls
+  (package
+    (inherit xurls)
+    (name "go-mvdan-cc-xurls")
+    (arguments
+     `(#:import-path "mvdan.cc/xurls"
+       #:tests? #f
+       #:install-source? #t
+       #:phases (modify-phases %standard-phases
+                  (delete 'build))))
+    (propagated-inputs (package-inputs xurls))
+    (native-inputs '())
+    (inputs '())))
+
 (define-public go-golang-org-x-lint
   (let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445")
         (revision "0"))
-- 
2.38.1

[bug#60912] [PATCH 14/25] gnu: Add misspell.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (misspell): New variable.
---
 gnu/packages/golang.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 2b778ac49e..b84fe59503 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4821,6 +4821,35 @@ (define-public go-gitlab-com-ambrevar-damerau
 similar word.")
       (license license:expat))))
 
+(define-public misspell
+  (package
+    (name "misspell")
+    (version "0.3.4")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/client9/misspell")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"))))
+    (build-system go-build-system)
+    (arguments
+     '(#:import-path "github.com/client9/misspell"
+       #:phases (modify-phases %standard-phases
+                  (replace 'build
+                    (lambda arguments
+                      (apply (assoc-ref %standard-phases
+                                        'build)
+                             `(,@arguments #:import-path
+                               "github.com/client9/misspell/cmd/misspell")))))))
+    (home-page "https://github.com/client9/misspell")
+    (synopsis "Install")
+    (description
+     "Package misspell corrects commonly misspelled English words in source files.")
+    (license license:expat)))
+
 (define-public go-github-com-stevedonovan-luar
   (let ((commit "22d247e5366095f491cd83edf779ee99a78f5ead")
         (revision "0"))
-- 
2.38.1

[bug#60914] [PATCH 15/25] gnu: Add go-github-com-client9-misspell.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-github-com-client9-misspell): New variable.
---
 gnu/packages/golang.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b84fe59503..fe45b29215 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4850,6 +4850,20 @@ (define-public misspell
      "Package misspell corrects commonly misspelled English words in source files.")
     (license license:expat)))
 
+(define-public go-github-com-client9-misspell
+  (package
+    (inherit misspell)
+    (name "go-github-com-client9-misspell")
+    (arguments
+     `(#:import-path "github.com/client9/misspell"
+       #:tests? #f
+       #:install-source? #t
+       #:phases (modify-phases %standard-phases
+                  (delete 'build))))
+    (propagated-inputs (package-inputs misspell))
+    (native-inputs '())
+    (inputs '())))
+
 (define-public go-github-com-stevedonovan-luar
   (let ((commit "22d247e5366095f491cd83edf779ee99a78f5ead")
         (revision "0"))
-- 
2.38.1

[bug#60913] [PATCH 16/25] gnu: Add go-github-com-google-go-cmdtest.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-github-com-google-go-cmdtest): New variable.
---
 gnu/packages/golang.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index fe45b29215..ced6438581 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -11044,6 +11044,35 @@ (define-public go-github-com-google-go-jsonnet
 implementation.")
     (license license:asl2.0)))
 
+(define-public go-github-com-google-go-cmdtest
+  (let ((commit "55ab3332a786118933ddf71544aae14951ba9bc5")
+        (revision "0"))
+    (package
+      (name "go-github-com-google-go-cmdtest")
+      (version (git-version "0.4.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/google/go-cmdtest")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "10kswvbdwissjb5mr0ys4b3ppxkxlpklqg7cr2z7rv21g2vwczbl"))))
+      (build-system go-build-system)
+      (arguments
+       '(#:import-path "github.com/google/go-cmdtest"))
+      (propagated-inputs (list go-github-com-google-renameio
+                               go-github-com-google-go-cmp-cmp))
+      (home-page "https://github.com/google/go-cmdtest")
+      (synopsis "Testing your CLI")
+      (description
+       "The cmdtest package simplifies testing of command-line interfaces.  It provides
+a simple, cross-platform, shell-like language to express command execution.  It
+can compare actual output with the expected output, and can also update a file
+with new \"golden\" output that is deemed correct.")
+      (license license:asl2.0))))
+
 (define-public go-github-com-google-safehtml
   (package
     (name "go-github-com-google-safehtml")
-- 
2.38.1

[bug#60916] [PATCH 17/25] gnu: Add unparam.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (unparam): New variable.
---
 gnu/packages/golang.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ced6438581..d980026a70 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9803,6 +9803,31 @@ (define-public go-go-uber-org-multierr
      "@code{multierr} allows combining one or more Go errors together.")
     (license license:expat)))
 
+(define-public unparam
+  (package
+    (name "unparam")
+    (version "0.0.0-20221223090309-7455f1af531d")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/mvdan/unparam")
+                    (commit (go-version->git-ref version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0wynf0b32azxljncw5fh9bwkxpdflvf9q1z16wyj432566yjh12c"))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "mvdan.cc/unparam"
+       #:go ,go-1.19))
+    (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))
+    (home-page "https://mvdan.cc/unparam/")
+    (synopsis "Find unused parameters in Go")
+    (description "Reports unused function parameters and results in Go code.")
+    (license license:bsd-3)))
+
 (define-public xurls
   (package
     (name "xurls")
-- 
2.38.1

[bug#60915] [PATCH 18/25] gnu: Add go-mvdan-cc-unparam.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-mvdan-cc-unparam): New variable.
---
 gnu/packages/golang.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d980026a70..eaff0dfc37 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9828,6 +9828,20 @@ (define-public unparam
     (description "Reports unused function parameters and results in Go code.")
     (license license:bsd-3)))
 
+(define-public go-mvdan-cc-unparam
+  (package
+    (inherit unparam)
+    (name "go-mvdan-cc-unparam")
+    (arguments
+     `(#:import-path "github.com/mvdan/unparam"
+       #:tests? #f
+       #:install-source? #t
+       #:phases (modify-phases %standard-phases
+                  (delete 'build))))
+    (propagated-inputs (package-inputs unparam))
+    (native-inputs '())
+    (inputs '())))
+
 (define-public xurls
   (package
     (name "xurls")
-- 
2.38.1

[bug#60918] [PATCH 19/25] gnu: Add govulncheck.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (govulncheck): New variable.
---
 gnu/packages/golang.scm | 51 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index eaff0dfc37..f135b2717f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -2956,6 +2956,57 @@ (define-public go-golang-org-x-crypto
       (home-page "https://go.googlesource.com/crypto/")
       (license license:bsd-3))))
 
+(define-public govulncheck
+  (package
+    (name "govulncheck")
+    (version "0.0.0-20221229164908-ebf31f7dc3ef")
+    (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
+                "1w055g90k7anrrcvfrsqklxzl9pl0vqdiwpayj9f0brwys9xhj7d"))))
+    (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
+                       (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")))))))
+    (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))
+    (home-page "https://golang.org/x/vuln")
+    (synopsis "Go Vulnerability Management")
+    (description
+     "This repository contains packages for accessing and analyzing data from the
+@@url{https://vuln.go.dev,Go Vulnerability Database}.  It contains the
+following:")
+    (license license:bsd-3)))
+
 (define-public go-github-com-protonmail-go-crypto
   (package
     (name "go-github-com-protonmail-go-crypto")
-- 
2.38.1

[bug#60919] [PATCH 20/25] gnu: Add go-golang-org-x-vuln.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-golang-org-x-vuln): New variable.
---
 gnu/packages/golang.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f135b2717f..26cd636c64 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3007,6 +3007,20 @@ (define-public govulncheck
 following:")
     (license license:bsd-3)))
 
+(define-public go-golang-org-x-vuln
+  (package
+    (inherit govulncheck)
+    (name "go-golang-org-x-vuln")
+    (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 '())))
+
 (define-public go-github-com-protonmail-go-crypto
   (package
     (name "go-github-com-protonmail-go-crypto")
-- 
2.38.1

[bug#60917] [PATCH 21/25] gnu: go-github-com-burntsushi-toml: Update to 1.2.1.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-github-com-burntsushi-toml): Update to 1.2.1.
---
 gnu/packages/golang.scm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 26cd636c64..660deceec5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3328,23 +3328,23 @@ (define-public go-golang-org-x-mod
 (define-public go-github-com-burntsushi-toml
   (package
     (name "go-github-com-burntsushi-toml")
-    (version "0.3.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/BurntSushi/toml")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32
-         "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"))))
+    (version "1.2.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/BurntSushi/toml")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1v9czq4hsyvdz7yx70y6sgq77wmrgfmn09r9cj4w85z38jqnamv7"))))
     (build-system go-build-system)
     (arguments
      '(#:import-path "github.com/BurntSushi/toml"))
     (home-page "https://github.com/BurntSushi/toml")
     (synopsis "Toml parser and encoder for Go")
-    (description "This package is toml parser and encoder for Go.  The interface
+    (description
+     "This package is toml parser and encoder for Go.  The interface
 is similar to Go's standard library @code{json} and @code{xml} package.")
     (license license:expat)))
 
-- 
2.38.1

[bug#60920] [PATCH 22/25] gnu: go-honnef-co-go-tools: Update to 0.3.3.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-honnef-co-go-tools): Update to 0.3.3.
---
 gnu/packages/golang.scm | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 660deceec5..97f1753f42 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -10008,27 +10008,26 @@ (define-public go-github-com-kisielk-gotool
 (define-public go-honnef-co-go-tools
   (package
     (name "go-honnef-co-go-tools")
-    (version "0.1.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/dominikh/go-tools")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "17li8jbw3cpn59kpcl3j3r2an4wkx3fc81xn0j4xgbjpkxh9493n"))))
+    (version "0.3.3")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/dominikh/go-tools")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "099z04v7vvwwglnps315s9fmal68xvzlc1g8m26iqi980grbwn32"))))
     (build-system go-build-system)
     (arguments
      `(#:import-path "honnef.co/go/tools"
        #:tests? #f
        ;; Source-only package
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'build))))
-    (propagated-inputs
-     (list go-golang-org-x-tools go-github-com-kisielk-gotool
-           go-github-com-burntsushi-toml))
+       #:phases (modify-phases %standard-phases
+                  (delete 'build))))
+    (propagated-inputs (list go-golang-org-x-exp go-golang-org-x-tools
+                             go-golang-org-x-mod go-github-com-kisielk-gotool
+                             go-github-com-burntsushi-toml))
     (home-page "https://honnef.co/go/tools")
     (synopsis "Staticcheck advanced Go linter")
     (description
-- 
2.38.1

[bug#60922] [PATCH 23/25] gnu: Add gofumpt.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (gofumpt): New variable.
---
 gnu/packages/golang.scm | 68 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 97f1753f42..40b6cf4a62 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9868,6 +9868,74 @@ (define-public go-go-uber-org-multierr
      "@code{multierr} allows combining one or more Go errors together.")
     (license license:expat)))
 
+(define-public gofumpt
+  (package
+    (name "gofumpt")
+    (version "0.4.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/mvdan/gofumpt")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "13ahi8q1a9h4dj6a7xp95c79d5svz5p37b6z91aswbq043qd417k"))
+              (modules '((guix build utils)))
+              (snippet `(let ((fixed-version (string-append ,version
+                                                            " (GNU Guix)")))
+                          ;; Gofumpt formats Go files, and therefore modifies
+                          ;; them. To help the developers diagnose issues, it
+                          ;; replaces any occurrence of a `//gofumpt:diagnose`
+                          ;; comment with some debugging information which
+                          ;; includes the module version. In the event gofumpt
+                          ;; was built without module support, it falls back
+                          ;; to a string "(devel)". Since our build system
+                          ;; does not yet support modules, we'll inject our
+                          ;; version string instead, since this is more
+                          ;; helpful.
+                          (substitute* "internal/version/version.go"
+                            (("^const fallbackVersion.+")
+                             (format #f "const fallbackVersion = \"~a\"~%"
+                                     fixed-version)))
+                          ;; These tests rely on `//gofumpt:diagnose` comments
+                          ;; being replaced with fixed information injected
+                          ;; from the test scripts, but this requires a binary
+                          ;; compiled as a Go module. Since we can't do this
+                          ;; yet, modify the test scripts with the version
+                          ;; string we're injecting.
+                          (delete-file "testdata/script/diagnose.txtar")
+                          (substitute* (find-files "testdata/script/"
+                                                   "\\.txtar$")
+                            (("v0.0.0-20220727155840-8dda8068d9f3")
+                             fixed-version)
+                            (("(devel)")
+                             fixed-version)
+                            (("v0.3.2-0.20220627183521-8dda8068d9f3")
+                             fixed-version))))))
+    (build-system go-build-system)
+    (arguments
+     `(#:import-path "mvdan.cc/gofumpt"
+       #:go ,go-1.19))
+    (native-inputs (list go-gopkg-in-errgo-fmt-errors))
+    (propagated-inputs (list go-github-com-pkg-diff
+                             go-github-com-kr-text
+                             go-github-com-kr-pretty
+                             go-golang-org-x-tools
+                             go-golang-org-x-sys
+                             go-golang-org-x-sync
+                             go-golang-org-x-mod
+                             go-github-com-rogpeppe-go-internal
+                             go-github-com-google-go-cmp-cmp
+                             go-github-com-frankban-quicktest))
+    (home-page "https://mvdan.cc/gofumpt/")
+    (synopsis "Formats Go files with a stricter ruleset than gofmt")
+    (description
+     "Enforce a stricter format than @@code{gofmt}, while being backwards compatible.
+That is, @@code{gofumpt} is happy with a subset of the formats that
+@@code{gofmt} is happy with.")
+    (license license:bsd-3)))
+
 (define-public unparam
   (package
     (name "unparam")
-- 
2.38.1

[bug#60921] [PATCH 24/25] gnu: Add go-mvdan-cc-gofumpt.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (go-mvdan-cc-gofumpt): New variable.
---
 gnu/packages/golang.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 40b6cf4a62..3dcd97a8c1 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9936,6 +9936,20 @@ (define-public gofumpt
 @@code{gofmt} is happy with.")
     (license license:bsd-3)))
 
+(define-public go-mvdan-cc-gofumpt
+  (package
+    (inherit gofumpt)
+    (name "go-mvdan-cc-gofumpt")
+    (arguments
+     `(#:import-path "mvdan.cc/gofumpt"
+       #:tests? #f
+       #:install-source? #t
+       #:phases (modify-phases %standard-phases
+                  (delete 'build))))
+    (propagated-inputs (package-inputs gofumpt))
+    (native-inputs '())
+    (inputs '())))
+
 (define-public unparam
   (package
     (name "unparam")
-- 
2.38.1

[bug#60899] [PATCH 25/25] gnu: Add gopls.

[Katherine Cox-Buday]

* gnu/packages/golang.scm (gopls): New variable.
---
 gnu/packages/golang.scm | 45 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3dcd97a8c1..faa6c61bc4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3021,6 +3021,51 @@ (define-public go-golang-org-x-vuln
     (native-inputs '())
     (inputs '())))
 
+(define-public gopls
+  (package
+    (name "gopls")
+    (version "0.11.0")
+    (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
+                "1l9y1rp7x51s6dnjn227fhdlnz4z1h41jn3x1aq49qki241w7m73"))))
+    (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-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")
+    (description
+     "Pronounced \"Go please\", this is the official Go language server developed by
+the Go team.  It provides IDE features to any LSP-compatible editor.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-protonmail-go-crypto
   (package
     (name "go-github-com-protonmail-go-crypto")
-- 
2.38.1

Request for review of: [bug#60899] [PATCH 00/25] gnu: golang: Add gopls

[Katherine Cox-Buday]

Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:

> This is a patch series to add the gopls package.
>
> I haven't contributed to many projects which use the e-mail flow, so
> hopefully I'm doing this correctly. Please feel free to make
> suggestions if not!
>
> Some of the diffs are a little busier than I'd like for version bumps.
> This is due to running `guix style` over everything.
>
> For all of the packages I have:
>
> . Run guix style
> . Run guix lint
> . Built 2x
> . Checked that the change is in the correct branch
> . Built all dependencies
> . Built the repository
>
> Katherine Cox-Buday (25):
>   gnu: go-golang-org-x-sync: Update to 0.1.0-1.8fcdb60.
>   gnu: go-golang-org-x-mod: Update to 0.7.0.
>   gnu: Add go-golang-org-x-exp.
>   gnu: Add go-github-com-jba-printsrc.
>   gnu: Add go-github-com-google-safehtml.
>   gnu: Add go-github-com-jba-templatecheck.
>   gnu: go-github-com-google-go-cmp-cmp: Update to 0.5.9.
>   gnu: go-github-com-pkg-diff: Update to
>     0.0.0-20210226163009-20ebb0f2a09e.
>   gnu: go-github-com-rogpeppe-go-internal: Update to 1.9.0.
>   gnu: gopkg-in-errgo-fmt-errors: Rename package to
>     go-gopkg-in-errgo-fmt-errors.
>   gnu: go-golang-org-x-tools: Update to 0.5.0.
>   gnu: Add xurls.
>   gnu: Add go-mvdan-cc-xurls.
>   gnu: Add misspell.
>   gnu: Add go-github-com-client9-misspell.
>   gnu: Add go-github-com-google-go-cmdtest.
>   gnu: Add unparam.
>   gnu: Add go-mvdan-cc-unparam.
>   gnu: Add govulncheck.
>   gnu: Add go-golang-org-x-vuln.
>   gnu: go-github-com-burntsushi-toml: Update to 1.2.1.
>   gnu: go-honnef-co-go-tools: Update to 0.3.3.
>   gnu: Add gofumpt.
>   gnu: Add go-mvdan-cc-gofumpt.
>   gnu: Add gopls.
>
>  gnu/packages/configuration-management.scm |   2 +-
>  gnu/packages/golang.scm                   | 695 ++++++++++++++++++----
>  2 files changed, 578 insertions(+), 119 deletions(-)
>
>
> base-commit: 5c921977179489caef4a9e54ada6696fc86d2f0b

Hello Guix! Acknowledging that everyone are volunteers, and busy (guilty
myself), this is a humble request for a review of this patch-series I
made two weeks ago so that it doesn't bit-rot.

I have a `gopls` home service[1] waiting to be proposed after this
patch-series is merged.

Thank you very much!

[1] https://github.com/kat-co/guix-channels/blob/upstream-staging/upstream/home/services/gopls.scm

P.S. I think I am following etiquette for review reminders (i.e. waiting
long enough, bringing this over to guix-devel), but I was having trouble
finding examples. If I haven't waited long enough, or have reminded in
the wrong way, please give me feedback.

-- 
Katherine

[bug#60899] Request for review of: [bug#60899] [PATCH 00/25] gnu: golang: Add gopls

[Katherine Cox-Buday]

Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:

> Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:
>
>> This is a patch series to add the gopls package.
>>
>> I haven't contributed to many projects which use the e-mail flow, so
>> hopefully I'm doing this correctly. Please feel free to make
>> suggestions if not!
>>
>> Some of the diffs are a little busier than I'd like for version bumps.
>> This is due to running `guix style` over everything.
>>
>> For all of the packages I have:
>>
>> . Run guix style
>> . Run guix lint
>> . Built 2x
>> . Checked that the change is in the correct branch
>> . Built all dependencies
>> . Built the repository
>>
>> Katherine Cox-Buday (25):
>>   gnu: go-golang-org-x-sync: Update to 0.1.0-1.8fcdb60.
>>   gnu: go-golang-org-x-mod: Update to 0.7.0.
>>   gnu: Add go-golang-org-x-exp.
>>   gnu: Add go-github-com-jba-printsrc.
>>   gnu: Add go-github-com-google-safehtml.
>>   gnu: Add go-github-com-jba-templatecheck.
>>   gnu: go-github-com-google-go-cmp-cmp: Update to 0.5.9.
>>   gnu: go-github-com-pkg-diff: Update to
>>     0.0.0-20210226163009-20ebb0f2a09e.
>>   gnu: go-github-com-rogpeppe-go-internal: Update to 1.9.0.
>>   gnu: gopkg-in-errgo-fmt-errors: Rename package to
>>     go-gopkg-in-errgo-fmt-errors.
>>   gnu: go-golang-org-x-tools: Update to 0.5.0.
>>   gnu: Add xurls.
>>   gnu: Add go-mvdan-cc-xurls.
>>   gnu: Add misspell.
>>   gnu: Add go-github-com-client9-misspell.
>>   gnu: Add go-github-com-google-go-cmdtest.
>>   gnu: Add unparam.
>>   gnu: Add go-mvdan-cc-unparam.
>>   gnu: Add govulncheck.
>>   gnu: Add go-golang-org-x-vuln.
>>   gnu: go-github-com-burntsushi-toml: Update to 1.2.1.
>>   gnu: go-honnef-co-go-tools: Update to 0.3.3.
>>   gnu: Add gofumpt.
>>   gnu: Add go-mvdan-cc-gofumpt.
>>   gnu: Add gopls.
>>
>>  gnu/packages/configuration-management.scm |   2 +-
>>  gnu/packages/golang.scm                   | 695 ++++++++++++++++++----
>>  2 files changed, 578 insertions(+), 119 deletions(-)
>>
>>
>> base-commit: 5c921977179489caef4a9e54ada6696fc86d2f0b
>
> Hello Guix! Acknowledging that everyone are volunteers, and busy (guilty
> myself), this is a humble request for a review of this patch-series I
> made two weeks ago so that it doesn't bit-rot.
>
> I have a `gopls` home service[1] waiting to be proposed after this
> patch-series is merged.
>
> Thank you very much!
>
> [1]
> https://github.com/kat-co/guix-channels/blob/upstream-staging/upstream/home/services/gopls.scm
>
> P.S. I think I am following etiquette for review reminders (i.e. waiting
> long enough, bringing this over to guix-devel), but I was having trouble
> finding examples. If I haven't waited long enough, or have reminded in
> the wrong way, please give me feedback.

Hello, this is another humble request for review :)

It looks like QA is passing, and I think I did a pretty thorough job of
making sure things follow standards and will apply cleanly.

-- 
Katherine

[bug#60903] [PATCH 01/25] gnu: go-golang-org-x-sync: Update to 0.1.0-1.8fcdb60.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

Hi,

*paren puts on hazmat suit, safety goggles, and protective gloves*

* gnu/packages/golang.scm (go-golang-org-x-sync): Update to 0.1.0-1.8fcdb60.

This one LGTM.

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60898] [PATCH 02/25] gnu: go-golang-org-x-mod: Update to 0.7.0.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 93 bytes --]

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

This LGTM.

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60901] [PATCH 03/25] gnu: Add go-golang-org-x-exp.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 395 bytes --]

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

> @@ -2855,6 +2855,33 @@ (define-public go-github-com-hashicorp-hcl-v2

> +    (description
> +     "This subrepository holds experimental and deprecated (in the @code{old}
> +directory) packages.")

How about:

  (description
   "This package provides deprecated and experimental Go modules.")

instead?

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60900] [PATCH 04/25] gnu: Add go-github-com-jba-printsrc.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 798 bytes --]

* gnu/packages/golang.scm (go-github-com-jba-printsrc): New variable.

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -8515,6 +8515,32 @@ (define-public go-github-com-go-git-go-billy

> +    (arguments
> +     '(#:import-path "github.com/jba/printsrc"
> +       ;; TODO: Open bug; expecting time.Local, but when local=UTC, we get time.UTC

Please add the bug report URL.

> +    (description
> +     "Package printsrc prints Go values as Go source.  It strives to render
> +legal Go source code, and returns an error when detects that it cannot.")

  (description
   "This package provides a Go library for printing Go values as legal source 
  code, and attempts to detect when this is not possible."

> +    ;; MIT

Redundant comment :)

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60905] [PATCH 08/25] gnu: go-github-com-pkg-diff: Update to 0.0.0-20210226163009-20ebb0f2a09e.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 2872 bytes --]


Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:

> * gnu/packages/golang.scm (go-github-com-pkg-diff): Update to 0.0.0-20210226163009-20ebb0f2a09e.
> ---
>  gnu/packages/golang.scm | 44 +++++++++++++++++++----------------------
>  1 file changed, 20 insertions(+), 24 deletions(-)
>
> diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
> index 9554234c7b..5e8159975f 100644
> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm
> @@ -8736,30 +8736,26 @@ (define-public go-github-com-go-git-go-git-fixtures
>      (license license:asl2.0)))
>  
>  (define-public go-github-com-pkg-diff
> -  (let ((commit "531926345625d489a6b56f860a569e68245ace36")
> -        (revision "1"))
> -    (package
> -      (name "go-github-com-pkg-diff")
> -      (version (git-version "0.0.1" revision commit))
> -      (source (origin
> -                (method git-fetch)
> -                (uri (git-reference
> -                      (url "https://github.com/pkg/diff")
> -                      (commit commit)))
> -                (file-name (git-file-name name version))
> -                (sha256
> -                 (base32
> -                  "1770m7qhww6lm0wj1v3mhv6hwa2v92p4w2fqxj1xyrg5dd58d944"))))
> -      (build-system go-build-system)
> -      (arguments
> -       `(#:import-path "github.com/pkg/diff"))
> -      (native-inputs
> -       (list go-github-com-sergi-go-diff))
> -      (home-page "https://github.com/pkg/diff/")
> -      (synopsis "Create and print diffs")
> -      (description
> -       "This package provides a Go library to create and print diffs.")
> -      (license license:bsd-3))))
> +  (package
> +    (name "go-github-com-pkg-diff")
> +    (version "0.0.0-20210226163009-20ebb0f2a09e")
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://github.com/pkg/diff")
> +                    (commit "20ebb0f2a09e612109b224b32f79370409108bcc")))
> +              (file-name (git-file-name name version))
> +              (sha256
> +               (base32
> +                "1g3dzgwhz4fx3ddpsv7fsa4r1v5clsp2lbw2qrkdk9y1vc5gi8yi"))))
> +    (build-system go-build-system)
> +    (arguments
> +     `(#:import-path "github.com/pkg/diff"))
> +    (home-page "https://github.com/pkg/diff/")
> +    (synopsis "Create and print diffs")
> +    (description
> +     "This package provides a Go library to create and print diffs.")
> +    (license license:bsd-3)))
>  
>  (define-public go-github-com-twpayne-go-shell
>    (package

I'm not sure I prefer the longer version here, and also having the
commit in the origin but then part of it in the version makes this a
little harder to update since you have to update both bits.

What led you to change from using the (let ((... bit here?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#60904] [PATCH 05/25] gnu: Add go-github-com-google-safehtml.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 810 bytes --]

* gnu/packages/golang.scm (go-github-com-google-safehtml): New variable.

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -10921,6 +10921,31 @@ (define-public go-github-com-google-go-jsonnet

> +    (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text)))

Please use new-style inputs.

> +    (synopsis "Safe HTML for Go")

  (synopsis "Go type for storing HTML data")

> +    (description
> +     "Package safehtml provides immutable string-like types which represent values
> +that are guaranteed to be safe, by construction or by escaping or sanitization,
> +to use in various HTML contexts and with various DOM APIs.")

  (description
   "This package provides a Go library for storing HTML data as an immutable string-like
  value.")

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60902] [PATCH 06/25] gnu: Add go-github-com-jba-templatecheck.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 833 bytes --]

* gnu/packages/golang.scm (go-github-com-jba-templatecheck): New variable.

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -8541,6 +8541,33 @@ (define-public go-github-com-jba-printsrc

> +    (synopsis "Checks Go templates for problems")

s/problems/errors/

> +    (description
> +     "Package templatecheck checks Go templates for problems.  It can detect
> +many errors that are normally caught only during execution.  Use templatecheck
> +in tests to find template errors early, and along template execution paths
> +that might only rarely be reached.")

  (description
   "This package provides a Go library for checking Go templates for errors,
  including many errors normally caught only during execution.")
  
> +    ;; MIT

Don't bother with the comment here :)

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60908] [PATCH 10/25] gnu: gopkg-in-errgo-fmt-errors: Rename package to go-gopkg-in-errgo-fmt-errors.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 676 bytes --]


Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:

> * gnu/packages/configuration-management.scm (chezmoi): Define in terms
> of'go-gopkg-in-errgo-fmt-errors'.
>
> * (go-gopkg-in-errgo-fmt-errors): New variable, formerly known as "gopkg-in-errgo-fmt-errors".

I'm no expert in changelog entries in commit messages, but I'd probably
write this like:

* gnu/packages/golang.scm (gopkg-in-errgo-fmt-errors):
Rename to …
(go-gopkg-in-errgo-fmt-errors): … this.
* gnu/packages/configuration-management.scm (chezmoi)[native-inputs]: Update
accordingly.


I think that's a little clearer in terms of the changes being made, and
has less words as well.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#60905] [PATCH 08/25] gnu: go-github-com-pkg-diff: Update to 0.0.0-20210226163009-20ebb0f2a09e.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1037 bytes --]

* gnu/packages/golang.scm (go-github-com-pkg-diff): Update to 0.0.0-20210226163009-20ebb0f2a09e.

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -8736,30 +8736,26 @@ (define-public go-github-com-go-git-go-git-fixtures

> +  (package
> +    (name "go-github-com-pkg-diff")
> +    (version "0.0.0-20210226163009-20ebb0f2a09e")

As Chris said, don't use this kind of version string :)

> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://github.com/pkg/diff")
> +                    (commit "20ebb0f2a09e612109b224b32f79370409108bcc")))

And especially don't write the commit twice.

> +    (synopsis "Create and print diffs")

  (synopsis "Generate and print diffs in Go")

> +    (description
> +     "This package provides a Go library to create and print diffs.")

  (description
   "This package provides a Go library to generate and print file
  differences in the @code{diff} format.")

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60907] [PATCH 07/25] gnu: go-github-com-google-go-cmp-cmp: Update to 0.5.9.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 892 bytes --]

* gnu/packages/golang.scm (go-github-com-google-go-cmp-cmp): Update to 0.5.9.

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -7024,28 +7024,27 @@ (define-public go-github-com-fatih-color

> +    (description
> +     "This package is intended to be a more powerful and safer
> +alternative to @@code{reflect.DeepEqual} for comparing whether two values are
> +semantically equal.")

This is a full sentence, but it doesn't really read well to me.  Also, there
should only be one ``@'' in ``@code{...}'', and "more powerful and safer" is
a bit vague :)

What about this?:

  (description
   "This package provides an alternative to the built-in @code{reflect.DeepEqual}
  function for checking if two values are semantically equal.  The advantages
  over the builtin function include:

  @enumerate
  [etc etc :)]
  @end enumerate")

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60906] [PATCH 09/25] gnu: go-github-com-rogpeppe-go-internal: Update to 1.9.0.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 105 bytes --]

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

LGTM :)

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60908] [PATCH 10/25] gnu: gopkg-in-errgo-fmt-errors: Rename package to go-gopkg-in-errgo-fmt-errors.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 291 bytes --]

* gnu/packages/configuration-management.scm (chezmoi): Define in terms
of'go-gopkg-in-errgo-fmt-errors'.

* (go-gopkg-in-errgo-fmt-errors): New variable, formerly known as "gopkg-in-errgo-fmt-errors".

LGTM except for the commit message; please adopt Chris's suggestion :)

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60909] [PATCH 11/25] gnu: go-golang-org-x-tools: Update to 0.5.0.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 92 bytes --]

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

LGTM :)

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60910] [PATCH 12/25] gnu: Add xurls.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1275 bytes --]

* gnu/packages/golang.scm (xurls): New variable.

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -9760,6 +9760,38 @@ (define-public go-go-uber-org-multierr

> +    (arguments
> +     `(#:import-path "mvdan.cc/xurls/v2"
> +       #:unpack-path "mvdan.cc/xurls/v2"
> +       #:phases (modify-phases %standard-phases
> +                  (replace 'build
> +                    (lambda arguments
> +                      (apply (assoc-ref %standard-phases
> +                                        'build)
> +                             `(,@arguments #:import-path
> +                               "mvdan.cc/xurls/v2/cmd/xurls")))))))

I'm not certain what you're trying to accomplish here, but would you be able
to replace this with:

  (arguments
   `(#:import-path "mvdan.cc/xurls/v2"
     #:unpack-path "mvdan.cc/xurls/v2/cmd/xurls"))

?

> +    (inputs (list go-golang-org-x-sync go-github-com-rogpeppe-go-internal))

Add newlines after the ``inputs'' symbol and between the inputs :)

> +    (description
> +     "Xurls extracts urls from plain text using regular expressions.  It can
> +be used as both a binary and a library.")

s/Xurls extracts/This package provides a Go library for extracting/

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60911] [PATCH 13/25] gnu: Add go-mvdan-cc-xurls.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 569 bytes --]

* gnu/packages/golang.scm (go-mvdan-cc-xurls): New variable.

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -9792,6 +9792,20 @@ (define-public xurls

> +    (arguments
> +     `(#:import-path "mvdan.cc/xurls"
> +       #:tests? #f
> +       #:install-source? #t
> +       #:phases (modify-phases %standard-phases
> +                  (delete 'build))))

Agh, I didn't read this before the previous patch :)  I'm not sure whether you
could simplify their arguments, but I suspect you can; could you please have a
go?

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60912] [PATCH 14/25] gnu: Add misspell.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 922 bytes --]

* gnu/packages/golang.scm (misspell): New variable.

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -4821,6 +4821,35 @@ (define-public go-gitlab-com-ambrevar-damerau

> +    (arguments
> +     '(#:import-path "github.com/client9/misspell"
> +       #:phases (modify-phases %standard-phases
> +                  (replace 'build
> +                    (lambda arguments
> +                      (apply (assoc-ref %standard-phases
> +                                        'build)
> +                             `(,@arguments #:import-path
> +                               "github.com/client9/misspell/cmd/misspell")))))))

Same comment on this arguments field as the last two.

> +    (synopsis "Install")

Um... :)

> +    (description
> +     "Package misspell corrects commonly misspelled English words in source files.")

s/Package misspell/This package/

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60912] [PATCH 14/25] gnu: Add misspell.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 655 bytes --]


Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:

> * gnu/packages/golang.scm (misspell): New variable.
> ---
>  gnu/packages/golang.scm | 29 +++++++++++++++++++++++++++++
>  1 file changed, 29 insertions(+)

...

> +    (synopsis "Install")
> +    (description
> +     "Package misspell corrects commonly misspelled English words in source files.")

I've changed this to:

    (synopsis "Correct commonly misspelled English words in source files")
    (description
     "misspell assists with correcting commonly misspelled English words in
source files.  A neutral variety of English is used by default, but a US or UK
locale can be selected.")

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#60914] [PATCH 15/25] gnu: Add go-github-com-client9-misspell.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

* gnu/packages/golang.scm (go-github-com-client9-misspell): New variable.

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -4850,6 +4850,20 @@ (define-public misspell

> +    (arguments
> +     `(#:import-path "github.com/client9/misspell"
> +       #:tests? #f
> +       #:install-source? #t
> +       #:phases (modify-phases %standard-phases
> +                  (delete 'build))))

Same comment as the last-but-one.

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60918] [PATCH 19/25] gnu: Add govulncheck.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 554 bytes --]


Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:

> * gnu/packages/golang.scm (govulncheck): New variable.
> ---
>  gnu/packages/golang.scm | 51 +++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 51 insertions(+)

...

> +    (description
> +     "This repository contains packages for accessing and analyzing data from the
> +@@url{https://vuln.go.dev,Go Vulnerability Database}.  It contains the
> +following:")

I've cut the second incomplete sentance out, and also fixed the @url bit
(just one @, you can test this with guix show).

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#60913] [PATCH 16/25] gnu: Add go-github-com-google-go-cmdtest.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 764 bytes --]

* gnu/packages/golang.scm (go-github-com-google-go-cmdtest): New variable.

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -11044,6 +11044,35 @@ (define-public go-github-com-google-go-jsonnet

> +      (synopsis "Testing your CLI")

  (synopsis "Test Go command line tools")

> +      (description
> +       "The cmdtest package simplifies testing of command-line interfaces.  It provides
> +a simple, cross-platform, shell-like language to express command execution.  It
> +can compare actual output with the expected output, and can also update a file
> +with new \"golden\" output that is deemed correct.")

  (description
   "This package provides a Go library to simplify the testing of @acronym{CLI}s.")

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60916] [PATCH 17/25] gnu: Add unparam.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 592 bytes --]

* gnu/packages/golang.scm (unparam): New variable.

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -9803,6 +9803,31 @@ (define-public go-go-uber-org-multierr

> +    (version "0.0.0-20221223090309-7455f1af531d")

Please use git-version instead.

> +    (synopsis "Find unused parameters in Go")

s/parameters/function parameters/

> +    (description "Reports unused function parameters and results in Go code.")

  (description
   "This package provides a tool for scanning Go code for unused function
  parameters and return values.")

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60915] [PATCH 18/25] gnu: Add go-mvdan-cc-unparam.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 90 bytes --]

* gnu/packages/golang.scm (go-mvdan-cc-unparam): New variable.

This SGTM.

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60918] [PATCH 19/25] gnu: Add govulncheck.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1684 bytes --]

* gnu/packages/golang.scm (govulncheck): New variable.

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -2956,6 +2956,57 @@ (define-public go-golang-org-x-crypto

> +    (version "0.0.0-20221229164908-ebf31f7dc3ef")

Please use git-version.

> +    (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
> +                       (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")))))))

Please try to see if you can remove ``(replace 'build ...)'' et cetera.

> +    (synopsis "Go Vulnerability Management")

  (synopsis "Manage data from the Go Vulnerability Database")

> +    (description
> +     "This repository contains packages for accessing and analyzing data from the
> +@@url{https://vuln.go.dev,Go Vulnerability Database}.  It contains the
> +following:")

  (description
   "This package provides a Go library and program for accessing and analysing
  data from the @url{https://vuln.go.dev, Go Vulnerability Database.")

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60919] [PATCH 20/25] gnu: Add go-golang-org-x-vuln.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 86 bytes --]

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

SGTM.

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60917] [PATCH 21/25] gnu: go-github-com-burntsushi-toml: Update to 1.2.1.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 659 bytes --]

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

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -3328,23 +3328,23 @@ (define-public go-golang-org-x-mod

>      (synopsis "Toml parser and encoder for Go")

  (synopsis "Parsing for TOML in Go")

> +    (description
> +     "This package is toml parser and encoder for Go.  The interface
>  is similar to Go's standard library @code{json} and @code{xml} package.")

  (description
   "This package provides a Go library for parsing the TOML configuration
  language, similar to the standard @code{json} and @code{xml} packages.")

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

bug#60899: [PATCH 00/25] gnu: golang: Add gopls

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1994 bytes --]


Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:

> This is a patch series to add the gopls package.
>
> I haven't contributed to many projects which use the e-mail flow, so hopefully
> I'm doing this correctly. Please feel free to make suggestions if not!
>
> Some of the diffs are a little busier than I'd like for version bumps. This is
> due to running `guix style` over everything.
>
> For all of the packages I have:
>
> . Run guix style
> . Run guix lint
> . Built 2x
> . Checked that the change is in the correct branch
> . Built all dependencies
> . Built the repository
>
> Katherine Cox-Buday (25):
>   gnu: go-golang-org-x-sync: Update to 0.1.0-1.8fcdb60.
>   gnu: go-golang-org-x-mod: Update to 0.7.0.
>   gnu: Add go-golang-org-x-exp.
>   gnu: Add go-github-com-jba-printsrc.
>   gnu: Add go-github-com-google-safehtml.
>   gnu: Add go-github-com-jba-templatecheck.
>   gnu: go-github-com-google-go-cmp-cmp: Update to 0.5.9.
>   gnu: go-github-com-pkg-diff: Update to
>     0.0.0-20210226163009-20ebb0f2a09e.
>   gnu: go-github-com-rogpeppe-go-internal: Update to 1.9.0.
>   gnu: gopkg-in-errgo-fmt-errors: Rename package to
>     go-gopkg-in-errgo-fmt-errors.
>   gnu: go-golang-org-x-tools: Update to 0.5.0.
>   gnu: Add xurls.
>   gnu: Add go-mvdan-cc-xurls.
>   gnu: Add misspell.
>   gnu: Add go-github-com-client9-misspell.
>   gnu: Add go-github-com-google-go-cmdtest.
>   gnu: Add unparam.
>   gnu: Add go-mvdan-cc-unparam.
>   gnu: Add govulncheck.
>   gnu: Add go-golang-org-x-vuln.
>   gnu: go-github-com-burntsushi-toml: Update to 1.2.1.
>   gnu: go-honnef-co-go-tools: Update to 0.3.3.
>   gnu: Add gofumpt.
>   gnu: Add go-mvdan-cc-gofumpt.
>   gnu: Add gopls.
>
>  gnu/packages/configuration-management.scm |   2 +-
>  gnu/packages/golang.scm                   | 695 ++++++++++++++++++----
>  2 files changed, 578 insertions(+), 119 deletions(-)

I've made a few tweaks and pushed this to master as
f3ab5888a0bc6446104ddbba41a413a86eb298e2.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#60920] [PATCH 22/25] gnu: go-honnef-co-go-tools: Update to 0.3.3.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 728 bytes --]

* gnu/packages/golang.scm (go-honnef-co-go-tools): Update to 0.3.3.

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -10008,27 +10008,26 @@ (define-public go-github-com-kisielk-gotool

> +    (propagated-inputs (list go-golang-org-x-exp go-golang-org-x-tools
> +                             go-golang-org-x-mod go-github-com-kisielk-gotool
> +                             go-github-com-burntsushi-toml))

Add newlines between the inputs.

>      (synopsis "Staticcheck advanced Go linter")

Please change this to:

  (synopsis "Static linter for Go code")

>      (description

I don't know what the description here is, but could you try to improve it
too if necessary?

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60922] [PATCH 23/25] gnu: Add gofumpt.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 555 bytes --]

* gnu/packages/golang.scm (gofumpt): New variable.

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -9868,6 +9868,74 @@ (define-public go-go-uber-org-multierr

> +    (description
> +     "Enforce a stricter format than @@code{gofmt}, while being backwards compatible.
> +That is, @@code{gofumpt} is happy with a subset of the formats that
> +@@code{gofmt} is happy with.")

  (description
   "This package provides a formatter for Go code that enforces a stricter
  subset of @code{gofmt}'s formatting.")

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60921] [PATCH 24/25] gnu: Add go-mvdan-cc-gofumpt.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 85 bytes --]

* gnu/packages/golang.scm (go-mvdan-cc-gofumpt): New variable.

SGTM.

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60899] [PATCH 25/25] gnu: Add gopls.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 2011 bytes --]

* gnu/packages/golang.scm (gopls): New variable.

> --- a/gnu/packages/golang.scm
> +++ b/gnu/packages/golang.scm

> @@ -3021,6 +3021,51 @@ (define-public go-golang-org-x-vuln

> +    (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"))))))

s/override/remove-other/, perhaps?

> +    (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-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))

Could this be changed to just ``inputs''?

> +    (description
> +     "Pronounced \"Go please\", this is the official Go language server developed by
> +the Go team.  It provides IDE features to any LSP-compatible editor.")

  (description
   "This package provides the official @acronym{LSP, language server protocol}
  server for the Go language, allowing LSP-compatible editors to automatically
  support @acronym{IDE, integrated development environment}-like features.")

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60899] [PATCH 00/25] gnu: golang: Add gopls

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

On Mon Feb 6, 2023 at 11:14 PM GMT, Christopher Baines wrote:
> I've made a few tweaks and pushed this to master as
> f3ab5888a0bc6446104ddbba41a413a86eb298e2.

Nooo, my review was too slow :P

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60899] [PATCH 00/25] gnu: golang: Add gopls

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 641 bytes --]


"(" <paren@disroot.org> writes:

> [[PGP Signed Part:Undecided]]
> On Mon Feb 6, 2023 at 11:14 PM GMT, Christopher Baines wrote:
>> I've made a few tweaks and pushed this to master as
>> f3ab5888a0bc6446104ddbba41a413a86eb298e2.
>
> Nooo, my review was too slow :P

I think reviewing changes/sending feedback after things have been merged
is fine (and important). If more people get involved in reviewing
things, this is probably something that'll happen more, so I think for
now it's good to embrace it.

Hopefully we can continue the discussion around these changes and
perhaps further improve things with some additional patches.

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#60899] [PATCH 00/25] gnu: golang: Add gopls

[Katherine Cox-Buday]

Christopher Baines <mail@cbaines.net> writes:

> I've made a few tweaks and pushed this to master as
> f3ab5888a0bc6446104ddbba41a413a86eb298e2.
>
> Thanks,
>
> Chris

Thank you so much!

I'm going to review the changes (and the reviews from open-paren) to try
and incorporate that going forward.

-- 
Katherine

[bug#60899] [PATCH 00/25] gnu: golang: Add gopls

[Katherine Cox-Buday]

Christopher Baines <mail@cbaines.net> writes:

> "(" <paren@disroot.org> writes:
>
>> [[PGP Signed Part:Undecided]]
>> On Mon Feb 6, 2023 at 11:14 PM GMT, Christopher Baines wrote:
>>> I've made a few tweaks and pushed this to master as
>>> f3ab5888a0bc6446104ddbba41a413a86eb298e2.
>>
>> Nooo, my review was too slow :P
>
> I think reviewing changes/sending feedback after things have been merged
> is fine (and important). If more people get involved in reviewing
> things, this is probably something that'll happen more, so I think for
> now it's good to embrace it.
>
> Hopefully we can continue the discussion around these changes and
> perhaps further improve things with some additional patches.
>
> Chris

I responded to Chris's original message, but: +1 to what Chris says. I'm
still going to look at your feedback, paren, and maybe send some more
patches.

Personally, I prefer always moving forward, so long as it doesn't break
anything.

Thank you very much for the reviews!

-- 
Katherine

[bug#60901] [PATCH 03/25] gnu: Add go-golang-org-x-exp.

[Katherine Cox-Buday]

"( via Guix-patches" via <guix-patches@gnu.org> writes:

> * gnu/packages/golang.scm (go-golang-org-x-exp): New variable.
>
>> @@ -2855,6 +2855,33 @@ (define-public go-github-com-hashicorp-hcl-v2
>
>> +    (description
>> +     "This subrepository holds experimental and deprecated (in the @code{old}
>> +directory) packages.")
>
> How about:
>
>   (description
>    "This package provides deprecated and experimental Go modules.")
>
> instead?

Yes, that's better within the Guix context, IMO.

As a guide, I tend to take the package descriptions from upstream's
descriptions in an effort to provide packages that are as close to
upstream as possible. But this kind of conflicts with the ideal of a
distribution providing a curated, holistic, experience.

Should I give more weight to the latter, sometimes at the expense of the
former?

-- 
Katherine

[bug#60904] [PATCH 05/25] gnu: Add go-github-com-google-safehtml.

[Katherine Cox-Buday]

"( via Guix-patches" via <guix-patches@gnu.org> writes:

> * gnu/packages/golang.scm (go-github-com-google-safehtml): New variable.
>
>> --- a/gnu/packages/golang.scm
>> +++ b/gnu/packages/golang.scm
>
>> @@ -10921,6 +10921,31 @@ (define-public go-github-com-google-go-jsonnet
>
>> +    (propagated-inputs `(("go-golang-org-x-text" ,go-golang-org-x-text)))
>
> Please use new-style inputs.

Ugh, +1, and sorry I missed this. I don't know why the importer doesn't
do this by default yet. I suppose that's another patch that needs to
happen.

I also don't know why `guix style` and `guix lint` didn't catch this.

>> +    (synopsis "Safe HTML for Go")
>
>   (synopsis "Go type for storing HTML data")

(see other response, wondering if we should take upstream synopses or
not)

>> +    (description
>> +     "Package safehtml provides immutable string-like types which represent values
>> +that are guaranteed to be safe, by construction or by escaping or sanitization,
>> +to use in various HTML contexts and with various DOM APIs.")
>
>   (description
>    "This package provides a Go library for storing HTML data as an immutable string-like
>   value.")

I disagree with this suggestion: the extra context about construction or
escaping takes me from "why would I want to store HTML data in a
struct", to, "oh this is a way to preclude passing around invalid/unsafe
HTML around".

-- 
Katherine

[bug#60905] [PATCH 08/25] gnu: go-github-com-pkg-diff: Update to 0.0.0-20210226163009-20ebb0f2a09e.

[Katherine Cox-Buday]

"( via Guix-patches" via <guix-patches@gnu.org> writes:

> * gnu/packages/golang.scm (go-github-com-pkg-diff): Update to
> 0.0.0-20210226163009-20ebb0f2a09e.
>
>> --- a/gnu/packages/golang.scm
>> +++ b/gnu/packages/golang.scm
>
>> @@ -8736,30 +8736,26 @@ (define-public go-github-com-go-git-go-git-fixtures
>
>> +  (package
>> +    (name "go-github-com-pkg-diff")
>> +    (version "0.0.0-20210226163009-20ebb0f2a09e")
>
> As Chris said, don't use this kind of version string :)

Ah, I actually have (what I think) is a valid reason for this. In Go,
when a module is in development, this long string, including the SHA, is
the actual version[1] of the module, and carries semantics for Go developers, i.e. "Signals that the module is still in development and unstable. The release carries no backwards compatibility or stability guarantees."

It's how it will be referenced by other Go modules, and so I thought it
best to make the version field reflect the actual version. The previous
iteration of this package had an incorrect version: upstream did not
assign it a 0.0.1 version; that's something we did.

I agree that this is confusing for Guix maintainers, and causes
duplicate information in the version and commit fields.

What are your opinions on this?

>> +    (source (origin
>> +              (method git-fetch)
>> +              (uri (git-reference
>> +                    (url "https://github.com/pkg/diff")
>> +                    (commit "20ebb0f2a09e612109b224b32f79370409108bcc")))
>
> And especially don't write the commit twice.
>
>> +    (synopsis "Create and print diffs")
>
>   (synopsis "Generate and print diffs in Go")

I only bumped the version here; the synopsis was pre-existing. But: is the language important? Do we say "Diff creates and prints diffs in
C"?

>> +    (description
>> +     "This package provides a Go library to create and print diffs.")
>
>   (description
>    "This package provides a Go library to generate and print file
>   differences in the @code{diff} format.")

[1] https://go.dev/doc/modules/version-numbers#in-development

-- 
Katherine

[bug#60902] [PATCH 06/25] gnu: Add go-github-com-jba-templatecheck.

[Katherine Cox-Buday]

"( via Guix-patches" via <guix-patches@gnu.org> writes:

> * gnu/packages/golang.scm (go-github-com-jba-templatecheck): New variable.
>
>> --- a/gnu/packages/golang.scm
>> +++ b/gnu/packages/golang.scm
>
>> @@ -8541,6 +8541,33 @@ (define-public go-github-com-jba-printsrc
>
>> +    (synopsis "Checks Go templates for problems")
>
> s/problems/errors/

Upstream's synopsis uses the word "validity". I think I probably pulled
the synopsis from the first sentence of upstream's description, which
uses the word "problems".

For future reference, would something like this really hold up a merge?

>> +    (description
>> +     "Package templatecheck checks Go templates for problems.  It can detect
>> +many errors that are normally caught only during execution.  Use templatecheck
>> +in tests to find template errors early, and along template execution paths
>> +that might only rarely be reached.")
>
>   (description
>    "This package provides a Go library for checking Go templates for errors,
>   including many errors normally caught only during execution.")

Can you give more general guidance on what a description should have? I
can't infer any general rules from the reviews you've given, other than
maybe you are suggesting shorter descriptions. But the manual says:

    Descriptions should take between five and ten lines.

So I think my inference is probably not correct.

>> +    ;; MIT
>
> Don't bother with the comment here :)

No? I like knowing what license things are! But if this is a style
thing, I can start leaving them off.

-- 
Katherine

[bug#60908] [PATCH 10/25] gnu: gopkg-in-errgo-fmt-errors: Rename package to go-gopkg-in-errgo-fmt-errors.

[Katherine Cox-Buday]

Christopher Baines <mail@cbaines.net> writes:

> Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:
>
>> * gnu/packages/configuration-management.scm (chezmoi): Define in terms
>> of'go-gopkg-in-errgo-fmt-errors'.
>>
>> * (go-gopkg-in-errgo-fmt-errors): New variable, formerly known as
>> "gopkg-in-errgo-fmt-errors".
>
> I'm no expert in changelog entries in commit messages, but I'd probably
> write this like:
>
> * gnu/packages/golang.scm (gopkg-in-errgo-fmt-errors):
> Rename to …
> (go-gopkg-in-errgo-fmt-errors): … this.
> * gnu/packages/configuration-management.scm (chezmoi)[native-inputs]: Update
> accordingly.
>
>
> I think that's a little clearer in terms of the changes being made,
> and has less words as well.

Thank you for the suggestions; I agree it is much clearer.

The changelog format is something I personally really struggle with, so
I use tools to hopefully get me closer to being correct. I am using the
auto-complete snippets provided `./etc/snippets`, and it looks like this
is the format defined in:

`./etc/snippets/yas/log-edit-mode/guix-vc-commit-message-rename-package`

I'd love to be able to get these right, and I'll endeavor to do so, but
if the tooling is suggesting unhelpful things, it's going to be a real
struggle for me. Should we update the snippets?

-- 
Katherine

[bug#60907] [PATCH 07/25] gnu: go-github-com-google-go-cmp-cmp: Update to 0.5.9.

[Katherine Cox-Buday]

"( via Guix-patches" via <guix-patches@gnu.org> writes:

> * gnu/packages/golang.scm (go-github-com-google-go-cmp-cmp): Update to 0.5.9.
>
>> --- a/gnu/packages/golang.scm
>> +++ b/gnu/packages/golang.scm
>
>> @@ -7024,28 +7024,27 @@ (define-public go-github-com-fatih-color
>
>> +    (description
>> +     "This package is intended to be a more powerful and safer
>> +alternative to @@code{reflect.DeepEqual} for comparing whether two values are
>> +semantically equal.")
>
> This is a full sentence, but it doesn't really read well to me. Also,
> there should only be one ``@'' in ``@code{...}'', and "more powerful
> and safer" is a bit vague :)

I'd only intended this to be a version bump. Maybe I updated the
description based on feedback from `guix style` or `guix lint`.

At any rate, I agree the description is not very helpful, and uses
superlatives, which the manual calls out as an anti-pattern.

>
> What about this?:
>
>   (description
>    "This package provides an alternative to the built-in @code{reflect.DeepEqual}
>   function for checking if two values are semantically equal.  The advantages
>   over the builtin function include:
>
>   @enumerate
>   [etc etc :)]
>   @end enumerate")

I like this much more, although I don't know enough about it to
enumerate the benefits. If I can discover those, I'll enumerate them :)

-- 
Katherine

[bug#60901] [PATCH 03/25] gnu: Add go-golang-org-x-exp.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 182 bytes --]

On Tue Feb 7, 2023 at 4:28 PM GMT, Katherine Cox-Buday wrote:
> Should I give more weight to the latter, sometimes at the expense of the
> former?

IMO: definitely.

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60902] [PATCH 06/25] gnu: Add go-github-com-jba-templatecheck.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

On Tue Feb 7, 2023 at 5:12 PM GMT, Katherine Cox-Buday wrote:
> No? I like knowing what license things are! But if this is a style
> thing, I can start leaving them off.

MIT == Expat or X11; a comment noting that it's MIT is redundant :)

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60904] [PATCH 05/25] gnu: Add go-github-com-google-safehtml.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1341 bytes --]

On Tue Feb 7, 2023 at 4:41 PM GMT, Katherine Cox-Buday wrote:
> >> +    (description
> >> +     "Package safehtml provides immutable string-like types which represent values
> >> +that are guaranteed to be safe, by construction or by escaping or sanitization,
> >> +to use in various HTML contexts and with various DOM APIs.")
> >
> >   (description
> >    "This package provides a Go library for storing HTML data as an immutable string-like
> >   value.")
>
> I disagree with this suggestion: the extra context about construction or
> escaping takes me from "why would I want to store HTML data in a
> struct", to, "oh this is a way to preclude passing around invalid/unsafe
> HTML around".

That's true.  There's no problem with incorporating it, but many upstream descriptions
are a bit too focused on the internals for guix IMO.  So I tried to construct a
description that got the point across without being too detailed; I probably went
too far.  (Also, I know it's a Go convention, but I personally think we should
remove the "package <name> is ..." phrasing where possible.)

How about this instead:

  (description
   "This package provides a Go library for storing HTML data as an immutable string-like
  value that is guaranteed to be safe to use in various HTML- and DOM-related contexts.")

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60905] [PATCH 08/25] gnu: go-github-com-pkg-diff: Update to 0.0.0-20210226163009-20ebb0f2a09e.

[( via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 850 bytes --]

On Tue Feb 7, 2023 at 5:04 PM GMT, Katherine Cox-Buday wrote:
> What are your opinions on this?

Hmm, interesting.  I think this would be better answered by more experienced
contributors.
>
> >> +    (source (origin
> >> +              (method git-fetch)
> >> +              (uri (git-reference
> >> +                    (url "https://github.com/pkg/diff")
> >> +                    (commit "20ebb0f2a09e612109b224b32f79370409108bcc")))
> >
> > And especially don't write the commit twice.

I should've elaborated: use GO-VERSION->GIT-REF here :)

> I only bumped the version here; the synopsis was pre-existing. But: is the language important? Do we say "Diff creates and prints diffs in
> C"?

Isn't this also a Go library?  If it isn't, then yeah, it's not important,
but if it is, I'd say you should add "in Go".

    -- (

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

[bug#60910] [PATCH 12/25] gnu: Add xurls.

[Katherine Cox-Buday]

"( via Guix-patches" via <guix-patches@gnu.org> writes:

> * gnu/packages/golang.scm (xurls): New variable.
>
>> --- a/gnu/packages/golang.scm
>> +++ b/gnu/packages/golang.scm
>
>> @@ -9760,6 +9760,38 @@ (define-public go-go-uber-org-multierr
>
>> +    (arguments
>> +     `(#:import-path "mvdan.cc/xurls/v2"
>> +       #:unpack-path "mvdan.cc/xurls/v2"
>> +       #:phases (modify-phases %standard-phases
>> +                  (replace 'build
>> +                    (lambda arguments
>> +                      (apply (assoc-ref %standard-phases
>> +                                        'build)
>> +                             `(,@arguments #:import-path
>> +                               "mvdan.cc/xurls/v2/cmd/xurls")))))))
>
> I'm not certain what you're trying to accomplish here, but would you be able
> to replace this with:
>
>   (arguments
>    `(#:import-path "mvdan.cc/xurls/v2"
>      #:unpack-path "mvdan.cc/xurls/v2/cmd/xurls"))
>
> ?

Hm, I'm sure I would have tried that, but I'll check and see if I can
condense this per your suggestion. Thanks!

>> +    (inputs (list go-golang-org-x-sync go-github-com-rogpeppe-go-internal))
>
> Add newlines after the ``inputs'' symbol and between the inputs :)

Why wouldn't `guix style` and `guix lint` correct this? I want to meet
the style guidelines, and I don't mean this as a contrarian statement,
but I'll never get this right unless a tool tells me it's wrong (or
ideally fixes it for me).

>> +    (description
>> +     "Xurls extracts urls from plain text using regular expressions.  It can
>> +be used as both a binary and a library.")
>
> s/Xurls extracts/This package provides a Go library for extracting/

https://guix.gnu.org/en/manual/devel/en/guix.html#Synopses-and-Descriptions:

    [Synopses] must not start with “a” or “the”, which usually does not
    bring anything; for instance, prefer “File-frobbing tool” over “A
    tool that frobs files”. The synopsis should say what the package
    is—e.g., “Core GNU utilities (file, text, shell)”—or what it is used
    for—e.g., the synopsis for GNU grep is “Print lines matching a
    pattern”.

The manual is speaking of synopses, but does it apply to descriptions
too? It seems to me like beginning the description with the name of the
binary is more correct than a self-referential "This package", which I
think meets the manual's qualifier for "does not bring anything".

Also, `Xurls` is both a library and an executable. This package is for
the executable, and a separate one was provided for the library. I think
it's probably better to keep it in the style of "$BINARY (thing that it
does)".

WDYT? These are just my opinions, and I'm open to learning! Please
include the "why" so I can have better judgment in the future.

-- 
Katherine

[bug#60912] [PATCH 14/25] gnu: Add misspell.

[Katherine Cox-Buday]

Christopher Baines <mail@cbaines.net> writes:

> Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:
>
>> * gnu/packages/golang.scm (misspell): New variable.
>> ---
>>  gnu/packages/golang.scm | 29 +++++++++++++++++++++++++++++
>>  1 file changed, 29 insertions(+)
>
> ...
>
>> +    (synopsis "Install")
>> +    (description
>> +     "Package misspell corrects commonly misspelled English words in source files.")

Oh jees! Sorry about that! My best guess is that I was typing in another
window, nudged the mouse, and then `guix style` capitalized it.

> I've changed this to:
>
>     (synopsis "Correct commonly misspelled English words in source files")
>     (description
>      "misspell assists with correcting commonly misspelled English words in
> source files.  A neutral variety of English is used by default, but a US or UK
> locale can be selected.")

Thank you!

-- 
Katherine

[bug#60918] [PATCH 19/25] gnu: Add govulncheck.

[Katherine Cox-Buday]

Christopher Baines <mail@cbaines.net> writes:

> Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:
>
>> * gnu/packages/golang.scm (govulncheck): New variable.
>> ---
>>  gnu/packages/golang.scm | 51 +++++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 51 insertions(+)
>
> ...
>
>> +    (description
>> +     "This repository contains packages for accessing and analyzing data from the
>> +@@url{https://vuln.go.dev,Go Vulnerability Database}.  It contains the
>> +following:")
>
> I've cut the second incomplete sentance out, and also fixed the @url bit
> (just one @, you can test this with guix show).

Thanks, and sorry. I'll update my local tooling to try and start
checking for this.

I think this must have been `guix import go`? It might have a bug that
adds an extra `@`, because I don't recall adding the description for
this package.

-- 
Katherine

[bug#60908] [PATCH 10/25] gnu: gopkg-in-errgo-fmt-errors: Rename package to go-gopkg-in-errgo-fmt-errors.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1600 bytes --]


Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:

> Christopher Baines <mail@cbaines.net> writes:
>
>> Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:
>>
>>> * gnu/packages/configuration-management.scm (chezmoi): Define in terms
>>> of'go-gopkg-in-errgo-fmt-errors'.
>>>
>>> * (go-gopkg-in-errgo-fmt-errors): New variable, formerly known as
>>> "gopkg-in-errgo-fmt-errors".
>>
>> I'm no expert in changelog entries in commit messages, but I'd probably
>> write this like:
>>
>> * gnu/packages/golang.scm (gopkg-in-errgo-fmt-errors):
>> Rename to …
>> (go-gopkg-in-errgo-fmt-errors): … this.
>> * gnu/packages/configuration-management.scm (chezmoi)[native-inputs]: Update
>> accordingly.
>>
>>
>> I think that's a little clearer in terms of the changes being made,
>> and has less words as well.
>
> Thank you for the suggestions; I agree it is much clearer.
>
> The changelog format is something I personally really struggle with, so
> I use tools to hopefully get me closer to being correct. I am using the
> auto-complete snippets provided `./etc/snippets`, and it looks like this
> is the format defined in:
>
> `./etc/snippets/yas/log-edit-mode/guix-vc-commit-message-rename-package`
>
> I'd love to be able to get these right, and I'll endeavor to do so, but
> if the tooling is suggesting unhelpful things, it's going to be a real
> struggle for me. Should we update the snippets?

I also struggle with this, so I'm don't really have any great
suggestions. If you think the snippets could be improved, then that
sounds great to me.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#60905] [PATCH 08/25] gnu: go-github-com-pkg-diff: Update to 0.0.0-20210226163009-20ebb0f2a09e.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1681 bytes --]


Katherine Cox-Buday <cox.katherine.e@gmail.com> writes:

> "( via Guix-patches" via <guix-patches@gnu.org> writes:
>
>> * gnu/packages/golang.scm (go-github-com-pkg-diff): Update to
>> 0.0.0-20210226163009-20ebb0f2a09e.
>>
>>> --- a/gnu/packages/golang.scm
>>> +++ b/gnu/packages/golang.scm
>>
>>> @@ -8736,30 +8736,26 @@ (define-public go-github-com-go-git-go-git-fixtures
>>
>>> +  (package
>>> +    (name "go-github-com-pkg-diff")
>>> +    (version "0.0.0-20210226163009-20ebb0f2a09e")
>>
>> As Chris said, don't use this kind of version string :)
>
> Ah, I actually have (what I think) is a valid reason for this. In Go,
> when a module is in development, this long string, including the SHA, is
> the actual version[1] of the module, and carries semantics for Go
> developers, i.e. "Signals that the module is still in development and
> unstable. The release carries no backwards compatibility or stability
> guarantees."
>
> It's how it will be referenced by other Go modules, and so I thought it
> best to make the version field reflect the actual version. The previous
> iteration of this package had an incorrect version: upstream did not
> assign it a 0.0.1 version; that's something we did.
>
> I agree that this is confusing for Guix maintainers, and causes
> duplicate information in the version and commit fields.
>
> What are your opinions on this?

I guess I'm not that fussed if a long version has some use.

What I would say is that as long as the version incorporates the commit
in some way and the commit is used in the package source bit, I'd use
the (let ((commit ... pattern to avoid duplicating bits of the commit
hash and make tweaking the commit easier.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]