From 6f9d52c1117279be567e2ee9f56f88e470867e92 Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Sun, 19 Sep 2021 22:20:51 -0700 Subject: [PATCH 4/4] 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]: Set #:go to 'go-1.16'. Signed-off-by: Leo Famulari --- gnu/packages/docker.scm | 2 +- gnu/packages/golang.scm | 2 +- gnu/packages/ipfs.scm | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) 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 @@ (define-public 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 7989a3a138..1ac6c81900 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -804,7 +804,7 @@ (define-public go-1.17 (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..b567b23353 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -48,7 +48,8 @@ (define-public go-github-com-ipfs-go-ipfs-cmdkit-files "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") -- 2.34.0