--- Begin Message ---
|
Subject: |
[PATCH 23/25] gnu: Add gofumpt. |
|
Date: |
Tue, 17 Jan 2023 18:45:08 -0700 |
* 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
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [bug#60899] [PATCH 00/25] gnu: golang: Add gopls |
|
Date: |
Tue, 07 Feb 2023 00:14:14 +0100 |
|
User-agent: |
mu4e 1.8.11; emacs 28.2 |
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
signature.asc
Description: PGP signature
--- End Message ---