From 8f70fb90a24096499ecd7077ff9a29497bb4e6cc Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 3 Jul 2024 09:25:32 +0100 Subject: [PATCH] gnu: packages/golang: Set default go version to 1.21. Golang versions 1.17 (02 Aug 2022), 1.18 (01 Feb 2023), 1.19 (06 Sep 2023) and 1.20 (06 Feb 2024) are EOL . These changes set preferable default version to the minimal currently maintained one e.g. 1.21 * gnu/packages/golang.scm (go): Set default to go-1.21, add annotation for the future maintenance. Remove field <#:go> setting Golang version to go-1.18, go-1.19, 1.20 and 1.21: * gnu/packages/admin.scm * gnu/packages/configuration-management.scm * gnu/packages/databases.scm * gnu/packages/disk.scm * gnu/packages/education.scm * gnu/packages/file-systems.scm * gnu/packages/finance.scm * gnu/packages/golang-check.scm * gnu/packages/golang-crypto.scm * gnu/packages/golang-web.scm * gnu/packages/golang-xyz.scm * gnu/packages/golang.scm * gnu/packages/high-availability.scm * gnu/packages/ipfs.scm * gnu/packages/irc.scm * gnu/packages/messaging.scm * gnu/packages/networking.scm * gnu/packages/syncthing.scm * gnu/packages/textutils.scm * gnu/packages/time.scm * gnu/packages/version-control.scm * gnu/packages/video.scm Change-Id: Ieba6a5d7a18423f838d14c02ad55a2ba9c8559eb --- gnu/packages/admin.scm | 1 - gnu/packages/configuration-management.scm | 1 - gnu/packages/databases.scm | 1 - gnu/packages/disk.scm | 1 - gnu/packages/education.scm | 1 - gnu/packages/file-systems.scm | 1 - gnu/packages/finance.scm | 4 +- gnu/packages/golang-check.scm | 30 ++++----------- gnu/packages/golang-crypto.scm | 8 +--- gnu/packages/golang-web.scm | 23 +---------- gnu/packages/golang-xyz.scm | 47 ++--------------------- gnu/packages/golang.scm | 21 ++++------ gnu/packages/high-availability.scm | 1 - gnu/packages/ipfs.scm | 11 ------ gnu/packages/irc.scm | 1 - gnu/packages/messaging.scm | 1 - gnu/packages/networking.scm | 5 +-- gnu/packages/syncthing.scm | 1 - gnu/packages/textutils.scm | 1 - gnu/packages/time.scm | 1 - gnu/packages/version-control.scm | 1 - gnu/packages/video.scm | 3 +- 22 files changed, 26 insertions(+), 139 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f0aa6adc85..b598a2b6af 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -6147,7 +6147,6 @@ file or files to several hosts.") (arguments (list #:import-path "github.com/digitalocean/doctl/cmd/doctl" #:unpack-path "github.com/digitalocean/doctl" - #:go go-1.19 #:build-flags #~(list (string-append "-ldflags=-X github.com/digitalocean/doctl.Label=release" " -X github.com/digitalocean/doctl.Major=" diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 818a80b94e..5a67de919f 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -48,7 +48,6 @@ (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/twpayne/chezmoi" #:install-source? #f #:phases diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index e6fabaa223..7ca8e9f16e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -5503,7 +5503,6 @@ compatible with SQLite using a graphical user interface.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:install-source? #f #:import-path "github.com/lighttiger2505/sqls")) (native-inputs diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 9b161182e4..ee76647475 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1308,7 +1308,6 @@ on your file system and offers to remove it. @command{rmlint} can find: (build-system go-build-system) (arguments (list - #:go go-1.18 #:install-source? #f #:import-path "github.com/gokcehan/lf")) (native-inputs diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 4e809f1098..ba86f1a96d 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -114,7 +114,6 @@ (build-system go-build-system) (arguments (list - #:go go-1.18 #:install-source? #f #:import-path "github.com/xalanq/cf-tool" #:phases diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index fa7da35898..707937b78c 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1956,7 +1956,6 @@ memory-efficient.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/oniony/TMSU" #:unpack-path "github.com/oniony/TMSU" #:install-source? #f diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 82c746a526..3505364c00 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1690,9 +1690,7 @@ trezord as a regular user instead of needing to it run as root.") (file-name (git-file-name name version)))) (build-system go-build-system) (arguments - `(#:import-path "github.com/trezor/trezord-go" - ;; Requires go 1.18 or later: https://github.com/trezor/trezord-go/commit/f559ee5079679aeb5f897c65318d3310f78223ca - #:go ,go-1.20)) + `(#:import-path "github.com/trezor/trezord-go")) (native-inputs (list go-github-com-gorilla-csrf go-github-com-gorilla-handlers diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index 328d0796a3..3dce518511 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -78,7 +78,6 @@ (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "atomicgo.dev/assert")) (home-page "https://atomicgo.dev/assert") (synopsis "Go package with tons of assertions") @@ -104,8 +103,8 @@ value and call @code{t.Fatal()} if the assertion fails.") (base32 "05jak1v9s2wrwrn6ar0s4388f7qg15q0qfmhfcswgl88720196z3")))) (build-system go-build-system) (arguments - (list #:go go-1.18 - #:import-path "github.com/alecthomas/assert/v2")) + (list + #:import-path "github.com/alecthomas/assert/v2")) (propagated-inputs (list go-github-com-alecthomas-repr go-github-com-hexops-gotextdiff)) @@ -620,7 +619,6 @@ differently.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/MarvinJWendt/testza" #:phases #~(modify-phases %standard-phases @@ -696,7 +694,6 @@ Gomega matcher library.") (base32 "1w5dldjjcz2kpyxml4zd9yah7galfpmhcpc2l4zc5pr3skpwpibv")))) (arguments (list - #:go go-1.20 #:import-path "github.com/onsi/ginkgo/v2")) (propagated-inputs (list go-github-com-go-logr-logr @@ -726,7 +723,6 @@ Gomega matcher library.") ;; Unless we disable the tests, we have a circular dependency on ;; ginkgo/v2. #:tests? #f - #:go go-1.21 #:import-path "github.com/onsi/gomega")) (propagated-inputs (list go-github-com-golang-protobuf @@ -758,7 +754,6 @@ framework.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/otiai10/mint")) (home-page "https://github.com/otiai10/mint") (synopsis "Minimal assertion for Golang testing framework") @@ -1229,7 +1224,6 @@ custom assertions to be used alongside native Go testing.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/warpfork/go-testmark")) (home-page "https://github.com/warpfork/go-testmark") (synopsis "Parser for @code{testmark} format") @@ -1258,7 +1252,6 @@ testmark} format, which itself is a subset of Markdown format.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/warpfork/go-wish")) (home-page "https://github.com/warpfork/go-wish") (synopsis "Test assertions for Golang") @@ -1314,7 +1307,6 @@ the end of a test.") ;; XXX: The project contains subdirectory which complicate it's testing ;; and it does not produce any binary. #:tests? #f - #:go go-1.20 #:import-path "go.uber.org/mock" #:phases #~(modify-phases %standard-phases @@ -1377,7 +1369,6 @@ advanced Go linter.") (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "pgregory.net/rapid")) (home-page "https://pgregory.net/rapid/") (synopsis "Go property-based testing library") @@ -1410,7 +1401,6 @@ thoroughly (name "ginkgo") (arguments (list - #:go go-1.20 #:import-path "github.com/onsi/ginkgo/ginkgo" #:unpack-path "github.com/onsi/ginkgo" #:install-source? #f)) @@ -1424,8 +1414,7 @@ tool.")))) (inherit go-honnef-co-go-tools) (name "go-keyify") (arguments - `(#:go ,go-1.20 - #:import-path "honnef.co/go/tools/cmd/keyify" + `(#:import-path "honnef.co/go/tools/cmd/keyify" #:unpack-path "honnef.co/go/tools" #:install-source? #f)) (synopsis "Transform an unkeyed struct literal into a keyed one in Go") @@ -1439,7 +1428,6 @@ tool.")))) (arguments (list #:install-source? #f - #:go go-1.19 #:import-path "github.com/google/pprof")) (description (string-append (package-description go-github-com-google-pprof) @@ -1451,8 +1439,7 @@ tool.")))) (inherit go-honnef-co-go-tools) (name "go-staticcheck") (arguments - `(#:go ,go-1.20 - #:import-path "honnef.co/go/tools/cmd/staticcheck" + `(#:import-path "honnef.co/go/tools/cmd/staticcheck" #:unpack-path "honnef.co/go/tools" #:install-source? #f)) (synopsis "Staticcheck advanced Go linter") @@ -1466,8 +1453,7 @@ simplifications, and enforces style rules."))) (inherit go-honnef-co-go-tools) (name "go-structlayout") (arguments - `(#:go ,go-1.20 - #:import-path "honnef.co/go/tools/cmd/structlayout" + `(#:import-path "honnef.co/go/tools/cmd/structlayout" #:unpack-path "honnef.co/go/tools" #:install-source? #f)) (synopsis "Display the layout (field sizes and padding) of structs in Go") @@ -1481,8 +1467,7 @@ flag."))) (inherit go-honnef-co-go-tools) (name "go-structlayout-optimize") (arguments - `(#:go ,go-1.20 - #:import-path "honnef.co/go/tools/cmd/structlayout-optimize" + `(#:import-path "honnef.co/go/tools/cmd/structlayout-optimize" #:unpack-path "honnef.co/go/tools" #:install-source? #f)) (synopsis "Reorder struct fields to minimize the amount of padding in Go") @@ -1495,8 +1480,7 @@ into @code{go-structlayout-pretty}."))) (inherit go-honnef-co-go-tools) (name "go-structlayout-pretty") (arguments - `(#:go ,go-1.20 - #:import-path "honnef.co/go/tools/cmd/structlayout-pretty" + `(#:import-path "honnef.co/go/tools/cmd/structlayout-pretty" #:unpack-path "honnef.co/go/tools" #:install-source? #f)) (synopsis "Format the output of go-structlayout with ASCII art in Go") diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index c07c58f685..0d04e26479 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -575,7 +575,6 @@ RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own.") (base32 "0px12zhdmzqjj5zlcr136rcsilpmi4chiz6arxv49q372j4nhmia")))) (arguments (list - #:go go-1.18 #:import-path "github.com/golang-jwt/jwt/v5")))) (define-public go-github-com-google-go-tpm @@ -973,8 +972,7 @@ Architecture Processors\" by J. Guilford et al.") (base32 "0ydh94083888xl2r4d1grzgqf3c818mkmdpj008jkh6h7m56wc4w")))) (build-system go-build-system) (arguments - (list #:go go-1.21 - #:import-path "github.com/multiformats/go-multihash" + (list #:import-path "github.com/multiformats/go-multihash" #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-multibase-specs @@ -1107,8 +1105,7 @@ official package.") (build-system go-build-system) (arguments (list - #:import-path "github.com/quic-go/qtls-go1-20" - #:go go-1.20)) + #:import-path "github.com/quic-go/qtls-go1-20")) (propagated-inputs (list go-golang-org-x-crypto go-golang-org-x-sys)) @@ -1134,7 +1131,6 @@ QUIC. For Go 1.20.") (build-system go-build-system) (arguments `(#:import-path "github.com/refraction-networking/utls" - #:go ,go-1.20 #:tests? #f)) ;requires internet access (propagated-inputs (list go-github-com-andybalholm-brotli diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index ac137560b5..e04fc91504 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -206,7 +206,6 @@ the parse trees produced by the html package.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/AudriusButkevicius/pfilter" #:phases #~(modify-phases %standard-phases @@ -561,8 +560,8 @@ and RFC 5389).") (base32 "1pwr7fzxgngb073q98qrz1f90bkk3pljynif6jl5a6q6kcsn7xf1")))) (build-system go-build-system) (arguments - (list #:go go-1.21 - #:import-path "github.com/cenkalti/backoff/v4")) + (list + #:import-path "github.com/cenkalti/backoff/v4")) (home-page "https://github.com/cenkalti/backoff") (synopsis "The exponential backoff algorithm in Go") (description "This is a Go port of the exponential backoff algorithm from @@ -1403,7 +1402,6 @@ JSON data to the machine.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/jackpal/gateway")) (native-inputs (list go-github-com-stretchr-testify)) @@ -1758,7 +1756,6 @@ following: (base32 "1rn02yn7494r7ayn585bbsddprbn8wdccxs4n2k5dmll4dyd39mp")))) (arguments (list - #:go go-1.21 #:import-path "github.com/multiformats/go-multiaddr")) (native-inputs (list go-github-com-stretchr-testify)) (propagated-inputs (list go-github-com-ipfs-go-cid @@ -1783,7 +1780,6 @@ following: (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/multiformats/go-multiaddr-dns" #:unpack-path "github.com/multiformats/go-multiaddr-dns")) (propagated-inputs @@ -1811,7 +1807,6 @@ following: (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/multiformats/go-multiaddr-fmt")) (propagated-inputs (list go-github-com-multiformats-go-multiaddr-0.12)) @@ -1875,7 +1870,6 @@ conversion to and from @command{net.Addr}.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "github.com/multiformats/go-multistream")) (propagated-inputs (list go-github-com-multiformats-go-varint)) @@ -1954,7 +1948,6 @@ which produce colorized output using github.com/fatih/color.") (arguments (list #:tests? #f ; Requires some unpackaged software and test data - #:go go-1.21 #:import-path "github.com/oschwald/geoip2-golang")) (propagated-inputs (list go-github-com-oschwald-maxminddb-golang)) @@ -1981,7 +1974,6 @@ databases in Go.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/oschwald/maxminddb-golang" #:phases #~(modify-phases %standard-phases @@ -2059,7 +2051,6 @@ in Golang.") (base32 "10nn9349f7snqkzncda5m013fgnzicrcxi6pb6ghc0vb6rhqkf30")))) (arguments (list - #:go go-1.21 #:import-path "github.com/pion/dtls/v2")) (native-inputs (list go-github-com-stretchr-testify)) @@ -2136,7 +2127,6 @@ part of @url{https://github.com/pion, Pion} WebRTC implementation.") (arguments (list #:tests? #f ;Tests require network access. - #:go go-1.21 #:import-path "github.com/pion/ice/v2")) (propagated-inputs (list go-github-com-google-uuid @@ -2166,7 +2156,6 @@ part of @url{https://github.com/pion, Pion} WebRTC implementation.") (arguments (list #:tests? #f ;Tests require network access. - #:go go-1.21 #:import-path "github.com/pion/ice/v3")) (propagated-inputs (list go-github-com-google-uuid @@ -2199,7 +2188,6 @@ part of @url{https://github.com/pion, Pion} WebRTC implementation.") ;; packaging, see ;; . #:tests? #f - #:go go-1.21 #:unpack-path "github.com/pion/mdns" #:import-path "github.com/pion/mdns")) (native-inputs @@ -2253,7 +2241,6 @@ part of @url{https://github.com/pion, Pion} WebRTC implementation.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/pion/rtp")) (propagated-inputs (list go-github-com-pion-randutil)) @@ -2280,7 +2267,6 @@ packetizer and depacketizer.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/pion/stun")) (native-inputs (list go-github-com-stretchr-testify)) @@ -2315,7 +2301,6 @@ packetizer and depacketizer.") (base32 "0zli55ls5izpr6cw0wj0gy44872xn9rk20i8ay9cfk7j2rb60y60")))) (arguments (list - #:go go-1.21 #:import-path "github.com/pion/stun/v2")) (propagated-inputs (list go-github-com-pion-dtls-v2 @@ -2509,7 +2494,6 @@ it like any library. The quickest way to get started is to look at the (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/pires/go-proxyproto")) (home-page "https://github.com/pires/go-proxyproto") (synopsis "Implementation of the PROXY protocol") @@ -2618,7 +2602,6 @@ to jQuery to the Go language.") (list ;; Tests require ginkgo v2. #:tests? #f - #:go go-1.20 #:import-path "github.com/quic-go/qpack")) (propagated-inputs (list go-github-com-onsi-ginkgo @@ -2650,7 +2633,6 @@ the Go standard library}.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/quic-go/quic-go" #:phases #~(modify-phases %standard-phases @@ -2710,7 +2692,6 @@ protocol.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/quic-go/webtransport-go")) (native-inputs (list go-go-uber-org-mock diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index eeefefb3f8..bd4f7da876 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -159,7 +159,6 @@ simulate (mock) keypresses for CI testing.") (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "atomicgo.dev/schedule")) (home-page "https://atomicgo.dev/schedule") (synopsis "Easily schedule non-blocking tasks in Golang") @@ -186,7 +185,6 @@ given time, in a given duration, or repeatedly at a given interval.") (list ;; Tests require root access to mount file system. #:tests? #f - #:go go-1.19 #:import-path "bazil.org/fuse")) (propagated-inputs (list go-github-com-tv42-httpunix go-golang-org-x-sys)) @@ -217,7 +215,6 @@ use the C library from the project called FUSE.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "code.cloudfoundry.org/bytefmt")) (native-inputs (list go-github-com-onsi-gomega @@ -274,7 +271,6 @@ a human-readable byte format.") ;; they may be sourced from sqlite package. (arguments (list - #:go go-1.21 #:import-path "git.sr.ht/~emersion/go-sqlite3-fts5" #:phases #~(modify-phases %standard-phases @@ -510,7 +506,6 @@ syntax highlighted HTML, ANSI-coloured text, etc.") (base32 "1qgr4gywjks869sc85wb8nby612b8wvsa1dwpsbanjsljq7wq7mp")))) (arguments (list - #:go go-1.19 #:import-path "github.com/alecthomas/chroma/v2" #:phases #~(modify-phases %standard-phases @@ -630,7 +625,6 @@ be stripped.") (list ;; One test failed when set to go-1.18 o lower, see ;; - #:go go-1.19 #:import-path "github.com/alecthomas/kong")) (native-inputs (list go-github-com-alecthomas-assert-v2)) @@ -658,8 +652,8 @@ with as little developer effort as possible.") (base32 "0k2vsd58rgwyylyn5zja6z6k1sg4m39g2fhd88lvja60ca51bh98")))) (build-system go-build-system) (arguments - (list #:go go-1.18 - #:import-path "github.com/alecthomas/participle/v2")) + (list + #:import-path "github.com/alecthomas/participle/v2")) (native-inputs (list go-github-com-alecthomas-assert-v2)) (home-page "https://github.com/alecthomas/participle") @@ -687,7 +681,6 @@ structs. The approach is similar to how other marshallers work in Golang, (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/alecthomas/repr")) (native-inputs (list go-github-com-stretchr-testify)) @@ -842,8 +835,7 @@ stored in a Go struct.") (base32 "1p7n09pywqra21l981fbkma9vzsyf31pbvw6xg5r4hp8h8scf955")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/benbjohnson/clock" - #:go ,go-1.21)) + `(#:import-path "github.com/benbjohnson/clock")) (home-page "https://github.com/benbjohnson/clock") (synopsis "Small library for mocking time in Go") (description @@ -1306,7 +1298,6 @@ submodules: (arguments (list #:tests? #t ; Tests require network interface access - #:go go-1.18 #:import-path "github.com/cskr/pubsub")) (home-page "https://github.com/cskr/pubsub") (synopsis "Simple pubsub package for go") @@ -1453,7 +1444,6 @@ gist (https://gist.github.com/kballard/272720).") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "github.com/dave/jennifer")) (home-page "https://github.com/dave/jennifer") (synopsis "Code generator for Go") @@ -1676,8 +1666,7 @@ Implements string conversion functionality for unit prefixes. "s := strconv.QuoteRune(rune(c))")))))) (build-system go-build-system) (arguments - `(#:import-path "github.com/dustin/gojson" - #:go ,go-1.21)) + `(#:import-path "github.com/dustin/gojson")) (home-page "https://github.com/dustin/gojson") (synopsis "Extended Golang's @code{encoding/json} module with the public scanner API") (description @@ -1787,7 +1776,6 @@ more similar API to regexp.")))) (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/expr-lang/expr")) (home-page "https://expr-lang.org/") (synopsis "Expression language and expression evaluation for Go") @@ -1958,7 +1946,6 @@ Representation,CBOR} (@url{https://www.rfc-editor.org/rfc/rfc8949.html,RFC (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "github.com/gabriel-vasile/mimetype" #:phases #~(modify-phases %standard-phases (add-before 'check 'add-supported-mimes-md @@ -2009,7 +1996,6 @@ Differentiation between text and binary files}. (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/go-logr/logr" #:phases #~(modify-phases %standard-phases @@ -2125,7 +2111,6 @@ the library more lightweight.") (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/goccy/go-yaml" #:phases #~(modify-phases %standard-phases @@ -2175,7 +2160,6 @@ the library more lightweight.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/gookit/color" #:phases #~(modify-phases %standard-phases @@ -2424,7 +2408,6 @@ Groupcache.") (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/hashicorp/golang-lru/v2")))) (define-public go-github-com-hashicorp-hcl @@ -2645,7 +2628,6 @@ and stop units of work, which may receive @code{Close} signals from many clients ;; segment_test.go:145: Actual: 2, Expected: 1 ;; segment_test.go:146: === #:tests? #f - #:go go-1.21 #:import-path "github.com/jdkato/twine" #:phases #~(modify-phases %standard-phases @@ -3044,7 +3026,6 @@ Printf/Sprintf etc.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:import-path "github.com/logrusorgru/aurora/v3")) (native-inputs (list go-github-com-stretchr-testify)))) @@ -3100,7 +3081,6 @@ implementing features like: (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/Masterminds/semver/v3")) (native-inputs (list go-github-com-stretchr-testify-next)) @@ -3343,7 +3323,6 @@ the @code{cpan} module @code{Parse::CommandLine}.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:import-path "github.com/mattn/go-sqlite3")) (home-page "https://github.com/mattn/go-sqlite3") (synopsis "Sqlite3 driver for Go") @@ -3612,7 +3591,6 @@ command line flags, config files, and default struct values.") (list ;; To run the full suite, the tests must be run as the root user. #:tests? #f - #:go go-1.20 #:import-path "github.com/msteinert/pam")) (propagated-inputs (list go-golang-org-x-term @@ -3710,7 +3688,6 @@ Authentication Modules, PAM} application API.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/multiformats/go-multibase" #:phases #~(modify-phases %standard-phases @@ -3750,7 +3727,6 @@ multibase} (self identifying base encodings) in Go.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:import-path "github.com/multiformats/go-multicodec" #:phases #~(modify-phases %standard-phases @@ -3809,7 +3785,6 @@ varints.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "github.com/nats-io/nats.go")) (propagated-inputs (list go-golang-org-x-text go-github-com-nats-io-nuid @@ -3892,7 +3867,6 @@ registry.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/neurosnap/sentences")) (home-page "https://github.com/neurosnap/sentences") (synopsis "Multilingual command line sentence tokenizer in Golang") @@ -4042,7 +4016,6 @@ included in this package.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/otiai10/copy" #:phases #~(modify-phases %standard-phases @@ -4214,7 +4187,6 @@ Pion}.") ;; Cycle: go-github-com-pterm-pterm -> go-github-com-marvinjwendt-testza ;; -> go-github-com-pterm-pterm #:tests? #f - #:go go-1.21 #:import-path "github.com/pterm/pterm")) (propagated-inputs (list go-atomicgo-dev-cursor @@ -4381,7 +4353,6 @@ synchronizing plain text: (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/shirou/gopsutil" #:phases #~(modify-phases %standard-phases (add-after 'unpack 'remove-v3 @@ -4425,7 +4396,6 @@ sensors).") (base32 "1xlfcx6giqaxdah2m02q2i8ynwlzar953wr8wqx1j3004xdgaivd")))) (arguments (list - #:go go-1.18 #:import-path "github.com/shirou/gopsutil" #:phases #~(modify-phases %standard-phases @@ -4501,7 +4471,6 @@ Use waterutil with it to work with TUN/TAP packets/frames.") ;; Package's tests appear to be hardcoded to the author's gitconfig ;; and require network access. #:tests? #f - #:go go-1.21 #:import-path "github.com/Songmu/gitconfig")) (propagated-inputs (list go-github-com-goccy-go-yaml)) @@ -4576,7 +4545,6 @@ well as a program to generate applications and command files.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/syndtr/goleveldb" #:phases #~(modify-phases %standard-phases @@ -4761,7 +4729,6 @@ document.") (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/tklauser/go-sysconf" #:phases #~(modify-phases %standard-phases (add-before 'check 'remove-failing-tests @@ -4798,7 +4765,6 @@ document.") (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/tklauser/numcpus" #:phases #~(modify-phases %standard-phases (add-before 'check 'remove-failing-tests @@ -5100,7 +5066,6 @@ CPU quota.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "go.uber.org/dig")) (native-inputs (list go-github-com-stretchr-testify-next)) @@ -5127,7 +5092,6 @@ object dependencies graph during the process startup.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "go.uber.org/fx")) (native-inputs (list go-github-com-stretchr-testify-next)) @@ -5186,7 +5150,6 @@ applications out of reusable, composable modules.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:import-path "go.uber.org/zap" #:phases #~(modify-phases %standard-phases @@ -5318,7 +5281,6 @@ values.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:install-source? #f #:import-path "github.com/alecthomas/chroma/cmd/chroma")) (native-inputs @@ -5357,7 +5319,6 @@ correctly."))) (name "go-numcpus") (arguments (list - #:go go-1.18 #:import-path "github.com/tklauser/numcpus/cmd/numcpus" #:unpack-path "github.com/tklauser/numcpus" #:install-source? #f)) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index eed7126873..8b5e0fa747 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -985,7 +985,10 @@ in the style of communicating sequential processes (@dfn{CSP}).") (list go-1.21) (package-native-inputs go-1.21))))) -(define-public go go-1.17) +;; +;; Default Golang version used in guix/build-system/go.scm to build packages. +;; +(define-public go go-1.21) (define make-go-std (mlambdaq (go) @@ -2227,7 +2230,6 @@ Go.") (arguments `(#:unpack-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird" #:import-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird/cmd/lyrebird" - #:go ,go-1.20 #:phases (modify-phases %standard-phases (add-after 'unpack 'substitutions @@ -2880,7 +2882,6 @@ web framework "0zff0qpqfzwa4xazppiq7jvpncnmx52m23qi4ih754b7rzhbk0iz")))) (arguments (list - #:go go-1.21 #:import-path "github.com/go-playground/validator/v10")) (propagated-inputs (modify-inputs (package-propagated-inputs @@ -3168,7 +3169,6 @@ command-line parsers.") (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 @@ -6277,8 +6277,7 @@ data serialization format.") "1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0")))) (build-system go-build-system) (arguments - (list #:go go-1.21 - #:import-path "google.golang.org/protobuf" + (list #:import-path "google.golang.org/protobuf" #:phases #~(modify-phases %standard-phases ;; XXX: Workaround for go-build-system's lack of Go modules @@ -8043,8 +8042,7 @@ Gemini clients and servers.") fixed-version)))))) (build-system go-build-system) (arguments - `(#:import-path "mvdan.cc/gofumpt" - #:go ,go-1.19)) + `(#:import-path "mvdan.cc/gofumpt")) (native-inputs (list go-gopkg-in-errgo-fmt-errors)) (propagated-inputs (list go-github-com-pkg-diff go-github-com-kr-text @@ -8093,8 +8091,7 @@ That is, @code{gofumpt} is happy with a subset of the formats that "0wynf0b32azxljncw5fh9bwkxpdflvf9q1z16wyj432566yjh12c")))) (build-system go-build-system) (arguments - `(#:import-path "mvdan.cc/unparam" - #:go ,go-1.19)) + `(#:import-path "mvdan.cc/unparam")) (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)) @@ -8479,7 +8476,6 @@ dependencies and a simple API.") (build-system go-build-system) (arguments (list #:import-path "github.com/Arceliar/ironwood" - #:go go-1.21 #:tests? #f #:phases #~(modify-phases %standard-phases @@ -8888,8 +8884,7 @@ ordered, mutable data structure.") (base32 "0pdy8f7bkm65gx4vknwcvfa619hknflqxkdlvmf427k2mzm91gmh")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/peterbourgon/diskv" - #:go ,go-1.18)) + `(#:import-path "github.com/peterbourgon/diskv")) (propagated-inputs (list go-github-com-google-btree)) (home-page "https://github.com/peterbourgon/diskv") (synopsis "Disk-backed key-value store") diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm index c629385310..89d3e22c7e 100644 --- a/gnu/packages/high-availability.scm +++ b/gnu/packages/high-availability.scm @@ -226,7 +226,6 @@ applications.") go-golang-org-x-time)) (arguments (list - #:go go-1.20 #:import-path "github.com/nats-io/nats-server" #:install-source? #f)) (home-page "https://github.com/nats-io/nats-server") diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index daf68903c2..078d50c5d8 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -56,7 +56,6 @@ (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-block-format")) (propagated-inputs (list go-github-com-multiformats-go-multihash @@ -88,7 +87,6 @@ corresponding to the block.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-cid")) (propagated-inputs (list go-github-com-multiformats-go-multihash @@ -117,7 +115,6 @@ used in @code{go-ipfs} and related packages to refer to a typed hunk of data.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-cidutil")) (propagated-inputs (list go-github-com-ipfs-go-cid @@ -237,7 +234,6 @@ throughout its lifetime.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-detect-race")) (home-page "https://github.com/ipfs/go-detect-race") (synopsis "Detect if compiled with race") @@ -262,7 +258,6 @@ throughout its lifetime.") go-github-com-multiformats-go-multihash)) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-ipfs-util")) (home-page "https://github.com/ipfs/go-ipfs-util") (synopsis "Common utilities used by @code{go-ipfs} and related packages") @@ -286,7 +281,6 @@ throughout its lifetime.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-ipld-cbor")) (propagated-inputs (list go-github-com-ipfs-go-block-format @@ -360,7 +354,6 @@ IPLD graph as detailed below. Objects are demonstrated here using both (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-ipld-format")) (propagated-inputs (list go-github-com-multiformats-go-multihash @@ -389,7 +382,6 @@ order to be a part of the @acronym{IPLD, InterPlanetary Linked Data} merkle-fore (build-system go-build-system) (arguments (list - #:go go-1.21 #:unpack-path "github.com/ipld/go-ipld-prime/" #:import-path "github.com/ipld/go-ipld-prime/" #:phases @@ -489,7 +481,6 @@ basic operations on IPLD objects (traversals, etc).") go-go-uber-org-zap)) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-log/v2")) (home-page "https://github.com/ipfs/go-log") (synopsis "Logging library used by @code{go-ipfs}") @@ -520,7 +511,6 @@ their levels to be controlled individually.") go-go-uber-org-zap)) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-log")))) (define-public go-github-com-whyrusleeping-cbor-gen @@ -753,7 +743,6 @@ written in Go.") (list #:unpack-path "github.com/ipfs/kubo" #:import-path "github.com/ipfs/kubo/cmd/ipfs" - #:go go-1.21 #:phases #~(modify-phases %standard-phases ;; https://github.com/ipfs/kubo/blob/master/docs/command-completion.md diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 72e91503c1..eecb8812e4 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -1108,7 +1108,6 @@ what.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:install-source? #f #:import-path "git.sr.ht/~emersion/soju" #:phases diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 0278653faf..bf4e2f078c 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -3306,7 +3306,6 @@ designed for experienced users.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/42wim/matterbridge")) (synopsis "Bridge together various messaging networks and protocols") (description diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c94f772b74..54d5f16f21 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4627,7 +4627,6 @@ QUIC protocol.") ;; TODO: figure out how tests are run #:tests? #f #:install-source? #f - #:go go-1.21 #:phases #~(modify-phases %standard-phases (replace 'build @@ -4722,7 +4721,6 @@ IPv6 Internet connectivity - it also works over IPv4.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "github.com/slackhq/nebula" #:install-source? #f #:phases @@ -4828,8 +4826,7 @@ on hub/switched networks. It is based on @acronym{ARP} packets, it will send "1kbcr6580a9pi0a3wssnfr3mnxqq2k9w1fg4khikn82lqaljab2f")))) (build-system go-build-system) (arguments - (list #:go go-1.21 - #:install-source? #f + (list #:install-source? #f #:import-path "github.com/macronut/phantomsocks" #:build-flags #~'("-tags" #$(if (target-linux?) "rawsocket" diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index ea8249869d..47cbb7ee74 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -66,7 +66,6 @@ (list #:modules '((srfi srfi-26) ; for cut (guix build utils) (guix build go-build-system)) - #:go go-1.20 #:import-path "github.com/syncthing/syncthing" ;; We don't need to install the source code for end-user applications. #:install-source? #f diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 0d704faed9..5510383d0c 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1581,7 +1581,6 @@ JSON for post-processing (build-system go-build-system) (arguments (list - #:go go-1.19 #:install-source? #f #:import-path "github.com/johnkerl/miller/cmd/mlr" #:unpack-path "github.com/johnkerl/miller" diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 2612201c11..27cea548ec 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -644,7 +644,6 @@ calls.") (build-system go-build-system) (arguments (list - #:go go-1.17 #:install-source? #f #:import-path "github.com/oz/tz")) (inputs diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 29401f87ff..f2898b519a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3825,7 +3825,6 @@ If several repos are related, it helps to see their status together.") (arguments (list #:install-source? #f - #:go go-1.21 #:import-path "github.com/x-motemen/ghq" #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b6bf9236b2..92d04e7ace 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2984,8 +2984,7 @@ To load this plugin, specify the following option when starting mpv: (delete-file "orfondl"))))) (build-system go-build-system) (arguments - (list #:go go-1.19 - #:install-source? #f + (list #:install-source? #f #:import-path "github.com/badlogic/orfondl" #:phases #~(modify-phases %standard-phases