From 1482e0d7894e18ed51e87d6f249ebd66e2d05186 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 Jun 2025 09:08:43 +0900 Subject: [PATCH] gnu: Remove #:go arguments using go-1.22, go-1.23 or go-1.24. We are now building with go-1.24 by default. Automated via: git grep -rl '#:go go-1.2' | xargs sed -i '/.*#:go go-1.2[234].*/d' Change-Id: Ib821d96753619c7748a67ff58b95d8fa358839b7 Modified-by: Sharlatan Hellseher Signed-off-by: Sharlatan Hellseher --- gnu/packages/astronomy.scm | 1 - gnu/packages/ci.scm | 1 - gnu/packages/containers.scm | 1 - gnu/packages/databases.scm | 2 -- gnu/packages/golang-apps.scm | 1 - gnu/packages/golang-check.scm | 1 - gnu/packages/golang-crypto.scm | 1 - gnu/packages/golang-web.scm | 16 ---------------- gnu/packages/golang-xyz.scm | 16 ---------------- gnu/packages/hexedit.scm | 1 - gnu/packages/ipfs.scm | 9 --------- gnu/packages/matrix.scm | 1 - gnu/packages/syncthing.scm | 1 - gnu/packages/textutils.scm | 1 - gnu/packages/version-control.scm | 2 -- gnu/packages/web.scm | 2 -- 16 files changed, 57 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 745120b85ce..5f5c8b88853 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -10014,7 +10014,6 @@ currently).") (build-system go-build-system) (arguments (list - #:go go-1.24 #:install-source? #f #:import-path "codeberg.org/astronexus/uranimator")) (native-inputs diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 557b15c0ff6..48c5fc959e9 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -314,7 +314,6 @@ reinventing them.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:install-source? #f #:import-path "gitea.com/gitea/act_runner" #:embed-files #~(list ".*\\.json" ".*\\.js" ".*\\.sh") diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index ed72c2eb02d..3c0cbc28967 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -406,7 +406,6 @@ Layer-4 sockets.") (arguments `(#:unpack-path "github.com/containernetworking/plugins" #:tests? #f ; XXX: see stat /var/run below - #:go ,go-1.24 #:phases (modify-phases %standard-phases (replace 'build (lambda _ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9d2e9c6c953..741d8fa1b9e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -501,7 +501,6 @@ database later.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:build-flags #~(list "-tags" "external_libzstd") #:test-flags #~(list "-tags" "external_libzstd" ;; Skip tests requiring git in PATH. @@ -607,7 +606,6 @@ table-level bloom filters, and updates to the MANIFEST format.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:install-source? #f #:import-path "github.com/dicedb/dice" #:build-flags diff --git a/gnu/packages/golang-apps.scm b/gnu/packages/golang-apps.scm index 2e54b8be350..38f055ce7b9 100644 --- a/gnu/packages/golang-apps.scm +++ b/gnu/packages/golang-apps.scm @@ -138,7 +138,6 @@ import of a 3rd party package at runtime).") (build-system go-build-system) (arguments (list - #:go go-1.24 #:install-source? #f #:import-path "golang.org/x/tools/gopls" #:unpack-path "golang.org/x/tools" diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 5ee473af49e..330ef4cc03d 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -2879,7 +2879,6 @@ used to skip the test (build-system go-build-system) (arguments (list - #:go go-1.23 #:skip-build? #t #:import-path "honnef.co/go/tools" #:unpack-path "honnef.co/go/tools")) diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index efb67fcea00..a8195db9a0b 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -1235,7 +1235,6 @@ RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own.") (build-system go-build-system) (arguments (list - #:go go-1.22 #:import-path "github.com/google/go-tpm" #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index ab9168c495c..e85e6880d40 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -119,7 +119,6 @@ (build-system go-build-system) (arguments (list - #:go go-1.22 #:import-path "0xacab.org/leap/lb")) (propagated-inputs (list go-github-com-golang-protobuf @@ -1826,7 +1825,6 @@ browser window.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:import-path "github.com/cockroachdb/errors" #:test-subdirs #~(list "assert/..." "barriers/..." @@ -2223,7 +2221,6 @@ Data Representation (XDR) standard protocol as specified in RFC (build-system go-build-system) (arguments (list - #:go go-1.22 #:import-path "github.com/digitalocean/godo" #:test-flags #~(list "-skip" (string-join @@ -3716,7 +3713,6 @@ OpenAPI 2.0).") (build-system go-build-system) (arguments (list - #:go go-1.22 #:import-path "github.com/go-webauthn/webauthn" #:phases #~(modify-phases %standard-phases @@ -5999,7 +5995,6 @@ intends to be compatible with Avahi.") (build-system go-build-system) (arguments (list - #:go go-1.24 #:import-path "github.com/LINBIT/golinstor")) (native-inputs (list go-github-com-stretchr-testify)) @@ -7554,7 +7549,6 @@ higher-level API for doing so.") (build-system go-build-system) (arguments (list - #:go go-1.24 #:skip-build? #t #:import-path "github.com/osrg/gobgp/v3")) (native-inputs @@ -10810,7 +10804,6 @@ https://openid.net/developers/how-connect-works/}.") (build-system go-build-system) (arguments (list - #:go go-1.22 #:import-path "gitlab.com/gitlab-org/api/client-go" #:test-flags #~(list "-skip" @@ -11091,7 +11084,6 @@ lists) (build-system go-build-system) (arguments (list - #:go go-1.22 #:import-path "go.opencensus.io" #:test-flags #~(list "-skip" @@ -11135,7 +11127,6 @@ lists) (build-system go-build-system) (arguments (list - #:go go-1.22 #:import-path "go.opentelemetry.io/contrib" #:tests? #f)) (native-inputs (list go-github-com-stretchr-testify)) @@ -11706,7 +11697,6 @@ the standard @code{context} package to store request-scoped values.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:import-path "google.golang.org/genproto/googleapis/api" #:unpack-path "google.golang.org/genproto")) (propagated-inputs @@ -11760,7 +11750,6 @@ the standard @code{context} package to store request-scoped values.") (build-system go-build-system) (arguments (list - #:go go-1.22 #:tests? #f ; TODO: full test suite needs more packages #:import-path "google.golang.org/grpc")) (propagated-inputs @@ -11849,7 +11838,6 @@ the standard @code{context} package to store request-scoped values.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:import-path "k8s.io/cri-api")) (native-inputs (list go-github-com-stretchr-testify)) @@ -11897,7 +11885,6 @@ docs}.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:import-path "k8s.io/kube-openapi" #:phases #~(modify-phases %standard-phases @@ -11952,7 +11939,6 @@ the code or routes.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:import-path "maunium.net/go/mautrix" #:embed-files #~(list @@ -12117,7 +12103,6 @@ etc) (build-system go-build-system) (arguments (list - #:go go-1.22 #:import-path "mvdan.cc/xurls/v2" #:build-flags #~(list (string-append "-ldflags=-X main.version=" #$version)) @@ -12180,7 +12165,6 @@ protocol.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:build-flags #~(list (string-append "-ldflags=" "-X main.lyrebirdVersion=" #$version " -s -w")) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index d31b2b2153e..ca8e895367e 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -2130,7 +2130,6 @@ interfaces.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:import-path "github.com/axiomhq/hyperloglog")) (propagated-inputs (list go-github-com-stretchr-testify go-github-com-kamstrup-intmap @@ -3794,7 +3793,6 @@ the Go language features.") (build-system go-build-system) (arguments (list - #:go go-1.22 #:skip-build? #t ;; TODO: More additional packages are required to enable all tests, it's ;; used as source only package. @@ -9650,7 +9648,6 @@ better way of handling YAML when marshaling to and from structs.") (build-system go-build-system) (arguments (list - #:go go-1.24 #:import-path "github.com/itchyny/astgen-go")) (home-page "https://github.com/itchyny/astgen-go") (synopsis "AST build for Golang @code{interface{}} => @code{ast.Node}") @@ -10377,7 +10374,6 @@ vendor,product and class information.") (build-system go-build-system) (arguments (list - #:go go-1.22 #:import-path "github.com/jba/templatecheck")) (propagated-inputs (list go-github-com-google-safehtml)) @@ -11140,7 +11136,6 @@ customized globally.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:import-path "github.com/kamstrup/intmap")) (home-page "https://github.com/kamstrup/intmap") (synopsis "Fast hashmap with integer keys for Golang") @@ -14995,7 +14990,6 @@ levels per backend and logger.") (build-system go-build-system) (arguments (list - #:go go-1.24 #:import-path "github.com/opencontainers/cgroups" #:test-flags ;; Tests requiring root access to /sys/fs/cgroup. @@ -15101,7 +15095,6 @@ container image format spec (OCI Image Format).") (build-system go-build-system) (arguments (list - #:go go-1.24 #:import-path "github.com/opencontainers/runc" ;; Most tests require additinoal set up and downloading images from ;; Internet. @@ -15217,7 +15210,6 @@ specification-runtime-spec.") (build-system go-build-system) (arguments (list - #:go go-1.24 #:import-path "github.com/opencontainers/umoci" ;; convert spec to rootless: inspecting mount flags of /etc/resolv.conf: ;; no such file or directory @@ -16592,7 +16584,6 @@ comments. (arguments (list #:skip-build? #t - #:go go-1.23 #:import-path "github.com/rogpeppe/go-internal" #:test-flags #~(list "-skip" "TestSimple/cover"))))) @@ -16867,7 +16858,6 @@ Lodash}.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:skip-build? #t #:import-path "github.com/SAP/go-hdb" ;; XXX: The most of the tests require access to database, run some @@ -18655,7 +18645,6 @@ supported by the time package (build-system go-build-system) (arguments (list - #:go go-1.22 #:embed-files #~(list ".*\\.xml") #:import-path "github.com/tomwright/dasel/v2")) (propagated-inputs @@ -20177,7 +20166,6 @@ utilities for cty Golang module.") (build-system go-build-system) (arguments (list - #:go go-1.24 #:import-path "github.com/zitadel/logging")) (native-inputs (list go-github-com-stretchr-testify @@ -20510,7 +20498,6 @@ word on a list of words, if none is found, look for a similar word.") (build-system go-build-system) (arguments (list - #:go go-1.22 #:import-path "go.abhg.dev/komplete")) (native-inputs (list go-github-com-stretchr-testify)) @@ -22180,7 +22167,6 @@ defined in @url{https://editorconfig.org/,https://editorconfig.org/}.") (build-system go-build-system) (arguments (list - #:go go-1.22 #:build-flags ;; Gofumpt formats Go files, and therefore modifies them. To help the ;; developers diagnose issues, it replaces any occurrence of a @@ -22237,7 +22223,6 @@ that @code{gofmt} is happy with.") (build-system go-build-system) (arguments (list - #:go go-1.22 #:skip-build? #t ; we need just lib here #:import-path "mvdan.cc/sh/v3" #:test-flags @@ -22376,7 +22361,6 @@ prints the Go version used to build that executable.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:import-path "sigs.k8s.io/json")) (home-page "https://github.com/kubernetes-sigs/json") (synopsis "JSON decoder with enchansed features") diff --git a/gnu/packages/hexedit.scm b/gnu/packages/hexedit.scm index e9e64827806..42f33985379 100644 --- a/gnu/packages/hexedit.scm +++ b/gnu/packages/hexedit.scm @@ -114,7 +114,6 @@ the file and search through it.") (build-system go-build-system) (arguments (list - #:go go-1.24 #:import-path "github.com/wader/fq")) (native-inputs (list go-github-com-burntsushi-toml diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 62182487711..82df928ca27 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -147,7 +147,6 @@ JSONMarshal/JSONUnmarshal to store/reload the Bloom filter.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:skip-build? #t #:embed-files #~(list "sorted-network-list.bin") #:test-subdirs #~(list "bitswap/..." @@ -499,7 +498,6 @@ hierarchy of the keys.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:import-path "github.com/ipfs/go-ds-pebble")) (propagated-inputs (list go-github-com-cockroachdb-pebble-v2 @@ -682,7 +680,6 @@ with @url{https://github.com/ipld/cid, CIDs}.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:import-path "github.com/ipfs/go-ipfs-cmds" #:phases #~(modify-phases %standard-phases @@ -1521,7 +1518,6 @@ code prior to it getting merged into @code{go-cid}.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:embed-files #~(list "sorted-network-list.bin") #:import-path "github.com/ipfs-shipyard/nopfs/ipfs" #:unpack-path "github.com/ipfs-shipyard/nopfs")) @@ -1815,7 +1811,6 @@ their levels to be controlled individually.") (build-system go-build-system) (arguments (list - #:go go-1.22 #:embed-files #~(list "sorted-network-list.bin") #:import-path "github.com/libp2p/go-libp2p" ;; XXX: Check how to enable the most of the tests, see GitHub Actions @@ -2009,7 +2004,6 @@ through @url{https://github.com/libp2p/libp2p, LibP2P} using Go's standard (build-system go-build-system) (arguments (list - #:go go-1.23 #:embed-files #~(list "sorted-network-list.bin") #:import-path "github.com/libp2p/go-libp2p-kad-dht")) (native-inputs @@ -2109,7 +2103,6 @@ kab-dht}. This DHT is modeled after Kademlia with S/Kademlia modifications.") (build-system go-build-system) (arguments (list - #:go go-1.22 ;; TODO: Tests may need some adjustments as they take quite a lot of ;; time to finish. #:import-path "github.com/libp2p/go-libp2p-pubsub" @@ -2485,7 +2478,6 @@ types.") (build-system go-build-system) (arguments (list - #:go go-1.22 #:embed-files #~(list "sorted-network-list.bin") #:unpack-path "github.com/ipfs/kubo" #:import-path "github.com/ipfs/kubo/cmd/ipfs" @@ -2669,7 +2661,6 @@ also mount the world at @code{/ipfs}.") (build-system go-build-system) (arguments (list - #:go go-1.22 #:embed-files #~(list "sorted-network-list.bin") #:install-source? #f #:import-path "gitlab.com/spritely/spritely-libp2p-daemon")) diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index c8edaf5d5aa..b6b35b0fa1f 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -68,7 +68,6 @@ (build-system go-build-system) (arguments (list - #:go go-1.23 #:install-source? #f #:tests? #f ; no tests provided #:import-path "go.mau.fi/mautrix-whatsapp/cmd/mautrix-whatsapp" diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 43844f0f362..20d6edd1b1d 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -70,7 +70,6 @@ (guix build go-build-system)) #:import-path "github.com/syncthing/syncthing" ;; Check 'go.mod' in the source distribution for the required version of Go. - #:go go-1.23 ;; We don't need to install the source code for end-user applications. #:install-source? #f #:phases diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 2ac93e75fb4..b9d3dd6ac8e 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1628,7 +1628,6 @@ of a Unix terminal to HTML code.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:install-source? #f #:embed-files #~(list ".*\\.gob") #:import-path "github.com/errata-ai/vale/cmd/vale" diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index f950fa050ef..55897de02ec 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1052,7 +1052,6 @@ the date of the most recent commit that modified them (build-system go-build-system) (arguments (list - #:go go-1.24 #:import-path "go.abhg.dev/gs" #:install-source? #f #:build-flags @@ -1644,7 +1643,6 @@ collaboration using typical untrusted file hosts or services.") (build-system go-build-system) (arguments (list - #:go go-1.24 #:import-path "github.com/Apteryks/git-repo-go" #:build-flags #~(list "-ldflags" (string-append diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 93e91e75ef0..d2b9e65253e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -403,7 +403,6 @@ one.") (build-system go-build-system) (arguments (list - #:go go-1.22 #:install-source? #f #:import-path "miniflux.app/v2" #:build-flags @@ -5835,7 +5834,6 @@ processor.") (build-system go-build-system) (arguments (list - #:go go-1.22 #:embed-files #~(list ".*.xml") #:install-source? #f #:import-path "github.com/noahgorstein/jqp"))