From: Katherine Cox-Buday <cox.katherine.e@gmail.com>
To: 60922@debbugs.gnu.org
Cc: Katherine Cox-Buday <cox.katherine.e@gmail.com>
Subject: [bug#60922] [PATCH 23/25] gnu: Add gofumpt.
Date: Tue, 17 Jan 2023 18:45:08 -0700 [thread overview]
Message-ID: <20230118014510.19320-24-cox.katherine.e@gmail.com> (raw)
In-Reply-To: <20230118014510.19320-1-cox.katherine.e@gmail.com>
* 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
next prev parent reply other threads:[~2023-01-18 1:47 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-18 1:44 [bug#60899] [PATCH 00/25] gnu: golang: Add gopls Katherine Cox-Buday
2023-01-18 1:44 ` [bug#60903] [PATCH 01/25] gnu: go-golang-org-x-sync: Update to 0.1.0-1.8fcdb60 Katherine Cox-Buday
2023-02-06 18:22 ` ( via Guix-patches via
2023-01-18 1:44 ` [bug#60898] [PATCH 02/25] gnu: go-golang-org-x-mod: Update to 0.7.0 Katherine Cox-Buday
2023-02-06 18:24 ` ( via Guix-patches via
2023-01-18 1:44 ` [bug#60901] [PATCH 03/25] gnu: Add go-golang-org-x-exp Katherine Cox-Buday
2023-02-06 19:13 ` ( via Guix-patches via
2023-02-07 16:28 ` Katherine Cox-Buday
2023-02-07 17:39 ` ( via Guix-patches via
2023-01-18 1:44 ` [bug#60900] [PATCH 04/25] gnu: Add go-github-com-jba-printsrc Katherine Cox-Buday
2023-02-06 19:15 ` ( via Guix-patches via
2023-01-18 1:44 ` [bug#60904] [PATCH 05/25] gnu: Add go-github-com-google-safehtml Katherine Cox-Buday
2023-02-06 22:04 ` ( via Guix-patches via
2023-02-07 16:41 ` Katherine Cox-Buday
2023-02-07 17:45 ` ( via Guix-patches via
2023-01-18 1:44 ` [bug#60902] [PATCH 06/25] gnu: Add go-github-com-jba-templatecheck Katherine Cox-Buday
2023-02-06 22:07 ` ( via Guix-patches via
2023-02-07 17:12 ` Katherine Cox-Buday
2023-02-07 17:41 ` ( via Guix-patches via
2023-01-18 1:44 ` [bug#60907] [PATCH 07/25] gnu: go-github-com-google-go-cmp-cmp: Update to 0.5.9 Katherine Cox-Buday
2023-02-06 22:20 ` ( via Guix-patches via
2023-02-07 17:28 ` Katherine Cox-Buday
2023-01-18 1:44 ` [bug#60905] [PATCH 08/25] gnu: go-github-com-pkg-diff: Update to 0.0.0-20210226163009-20ebb0f2a09e Katherine Cox-Buday
2023-02-06 22:04 ` Christopher Baines
2023-02-06 22:20 ` ( via Guix-patches via
2023-02-07 17:04 ` Katherine Cox-Buday
2023-02-07 17:48 ` ( via Guix-patches via
2023-02-08 11:47 ` Christopher Baines
2023-01-18 1:44 ` [bug#60906] [PATCH 09/25] gnu: go-github-com-rogpeppe-go-internal: Update to 1.9.0 Katherine Cox-Buday
2023-02-06 22:21 ` ( via Guix-patches via
2023-01-18 1:44 ` [bug#60908] [PATCH 10/25] gnu: gopkg-in-errgo-fmt-errors: Rename package to go-gopkg-in-errgo-fmt-errors Katherine Cox-Buday
2023-02-06 22:17 ` Christopher Baines
2023-02-07 17:20 ` Katherine Cox-Buday
2023-02-08 11:45 ` Christopher Baines
2023-02-06 22:22 ` ( via Guix-patches via
2023-01-18 1:44 ` [bug#60909] [PATCH 11/25] gnu: go-golang-org-x-tools: Update to 0.5.0 Katherine Cox-Buday
2023-02-06 22:23 ` ( via Guix-patches via
2023-01-18 1:44 ` [bug#60910] [PATCH 12/25] gnu: Add xurls Katherine Cox-Buday
2023-02-06 22:32 ` ( via Guix-patches via
2023-02-07 17:51 ` Katherine Cox-Buday
2023-01-18 1:44 ` [bug#60911] [PATCH 13/25] gnu: Add go-mvdan-cc-xurls Katherine Cox-Buday
2023-02-06 22:34 ` ( via Guix-patches via
2023-01-18 1:44 ` [bug#60912] [PATCH 14/25] gnu: Add misspell Katherine Cox-Buday
2023-02-06 22:35 ` ( via Guix-patches via
2023-02-06 22:36 ` Christopher Baines
2023-02-07 17:53 ` Katherine Cox-Buday
2023-01-18 1:45 ` [bug#60914] [PATCH 15/25] gnu: Add go-github-com-client9-misspell Katherine Cox-Buday
2023-02-06 22:36 ` ( via Guix-patches via
2023-01-18 1:45 ` [bug#60913] [PATCH 16/25] gnu: Add go-github-com-google-go-cmdtest Katherine Cox-Buday
2023-02-06 23:05 ` ( via Guix-patches via
2023-01-18 1:45 ` [bug#60916] [PATCH 17/25] gnu: Add unparam Katherine Cox-Buday
2023-02-06 23:07 ` ( via Guix-patches via
2023-01-18 1:45 ` [bug#60915] [PATCH 18/25] gnu: Add go-mvdan-cc-unparam Katherine Cox-Buday
2023-02-06 23:07 ` ( via Guix-patches via
2023-01-18 1:45 ` [bug#60918] [PATCH 19/25] gnu: Add govulncheck Katherine Cox-Buday
2023-02-06 22:52 ` Christopher Baines
2023-02-07 17:56 ` Katherine Cox-Buday
2023-02-06 23:10 ` ( via Guix-patches via
2023-01-18 1:45 ` [bug#60919] [PATCH 20/25] gnu: Add go-golang-org-x-vuln Katherine Cox-Buday
2023-02-06 23:11 ` ( via Guix-patches via
2023-01-18 1:45 ` [bug#60917] [PATCH 21/25] gnu: go-github-com-burntsushi-toml: Update to 1.2.1 Katherine Cox-Buday
2023-02-06 23:12 ` ( via Guix-patches via
2023-01-18 1:45 ` [bug#60920] [PATCH 22/25] gnu: go-honnef-co-go-tools: Update to 0.3.3 Katherine Cox-Buday
2023-02-06 23:15 ` ( via Guix-patches via
2023-01-18 1:45 ` Katherine Cox-Buday [this message]
2023-02-06 23:17 ` [bug#60922] [PATCH 23/25] gnu: Add gofumpt ( via Guix-patches via
2023-01-18 1:45 ` [bug#60921] [PATCH 24/25] gnu: Add go-mvdan-cc-gofumpt Katherine Cox-Buday
2023-02-06 23:17 ` ( via Guix-patches via
2023-01-18 1:45 ` [bug#60899] [PATCH 25/25] gnu: Add gopls Katherine Cox-Buday
2023-02-06 23:28 ` ( via Guix-patches via
2023-01-30 16:53 ` Request for review of: [bug#60899] [PATCH 00/25] gnu: golang: " Katherine Cox-Buday
2023-02-06 16:53 ` [bug#60899] " Katherine Cox-Buday
2023-02-06 23:14 ` bug#60899: " Christopher Baines
2023-02-06 23:28 ` [bug#60899] " ( via Guix-patches via
2023-02-07 7:42 ` Christopher Baines
2023-02-07 16:02 ` Katherine Cox-Buday
2023-02-07 15:59 ` Katherine Cox-Buday
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230118014510.19320-24-cox.katherine.e@gmail.com \
--to=cox.katherine.e@gmail.com \
--cc=60922@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.