Subject: bug#60909: closed (Re: [bug#60899] [PATCH 00/25] gnu: golang: Add gopls)

From: [email-masked] (GNU bug Tracking System)
Date: Mon, 06 Feb 2023 23:16:06 +0000

Your bug report

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

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
60899: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=60899
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#60899] [PATCH 00/25] gnu: golang: Add gopls
From: Christopher Baines <[email-masked]>
To: Katherine Cox-Buday <[email-masked]>
Cc: [email-masked], [email-masked]
Date: Tue, 07 Feb 2023 00:14:14 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Katherine Cox-Buday <[email-masked]> 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

Subject: [PATCH 11/25] gnu: go-golang-org-x-tools: Update to 0.5.0.
From: Katherine Cox-Buday <[email-masked]>
To: [email-masked]
Cc: Katherine Cox-Buday <[email-masked]>
Date: Tue, 17 Jan 2023 18:44:56 -0700
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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