From 717be95339c953f53a22b9d98378c76025263737 Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Sun, 19 Sep 2021 22:20:51 -0700 Subject: build-system/go: Use go-1.17 by default. Build all Go packages with go-1.17 by default. Explicitly specify an older Go version in packages which cannot build with go-1.17. * gnu/packages/golang.scm (go): Update from 'go-1.14' to 'go-1.17'. * gnu/packages/docker.scm (docker)[native-inputs]: Explicitly use 'go-1.14'. * gnu/packages/ipfs.scm (go-github-com-ipfs-go-ipfs-cmdkit-files)[arguments]: Explicitly use Go 1.16. (go-ipfs)[arguments]: Use the default version of Go. * gnu/packages/syncthing.scm (syncthing)[arguments]: Likewise. * gnu/packages/admin.scm (runitor)[arguments]: Likewise. Signed-off-by: Leo Famulari --- gnu/packages/admin.scm | 1 - gnu/packages/docker.scm | 2 +- gnu/packages/golang.scm | 2 +- gnu/packages/ipfs.scm | 4 ++-- gnu/packages/syncthing.scm | 1 - 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d59d6730d5..132e7b5343 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4812,7 +4812,6 @@ FIFO and UNIX interprocess communication.") (build-system go-build-system) (arguments `(#:unpack-path "bdd.fi/x/runitor" - #:go ,go-1.17 #:build-flags '(,(string-append "-ldflags=-X main.Version=" version)) #:import-path "bdd.fi/x/runitor/cmd/runitor" #:install-source? #f)) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index cdf62f5e9a..d012ed43c6 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -585,7 +585,7 @@ built-in registry server of Docker.") ("xz" ,xz))) (native-inputs (list eudev ; TODO: Should be propagated by lvm2 (.pc -> .pc) - go gotestsum pkg-config)) + go-1.14 gotestsum pkg-config)) (synopsis "Docker container component library, and daemon") (description "This package provides a framework to assemble specialized container systems. It includes components for orchestration, image diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d7770724d2..50d03516cf 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -829,7 +829,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (alist-replace "go" (list go-1.16) (package-native-inputs go-1.16)) (package-native-inputs go-1.16))))) -(define-public go go-1.14) +(define-public go go-1.17) (define-public (make-go-std go) "Return a package which builds the standard library for Go compiler GO." diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index f566b850aa..7e9a49a31b 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -48,7 +48,8 @@ "0qk6fshgdmhp8dip2ksm13j6nywi41m9mn0czkvmw6b697z85l2r")))) (build-system go-build-system) (arguments - '(#:unpack-path "github.com/ipfs/go-ipfs-cmdkit" + `(#:go ,go-1.16 + #:unpack-path "github.com/ipfs/go-ipfs-cmdkit" #:import-path "github.com/ipfs/go-ipfs-cmdkit/files")) (home-page "https://github.com/ipfs/go-ipfs-cmdkit") (synopsis "Shared types, functions and values for go-ipfs") @@ -230,7 +231,6 @@ written in Go.") (arguments `(#:unpack-path "github.com/ipfs/go-ipfs" #:import-path "github.com/ipfs/go-ipfs/cmd/ipfs" - #:go ,go-1.17 #:phases (modify-phases %standard-phases (add-before 'reset-gzip-timestamps 'make-files-writable (lambda* (#:key outputs #:allow-other-keys) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 112a437875..cc4d07f72c 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -65,7 +65,6 @@ `(#:modules ((srfi srfi-26) ; for cut (guix build utils) (guix build go-build-system)) - #:go ,go-1.17 #:import-path "github.com/syncthing/syncthing" ;; We don't need to install the source code for end-user applications. #:install-source? #f -- cgit v1.2.3