[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#39570] [PATCH] gnu: go: update to 1.13.2
From: |
Jack Hill |
Subject: |
[bug#39570] [PATCH] gnu: go: update to 1.13.2 |
Date: |
Tue, 11 Feb 2020 14:48:20 -0500 |
* gnu/packages/golang.scm (go-1.12): Rename to go-1.13, [version]: Update to
1.13.7
(go): Update to go-1.13
* guix/build/go-build-system.scm (setup-go-environment): Set GO111MODULE to
off.
---
gnu/packages/golang.scm | 9 ++++-----
guix/build/go-build-system.scm | 4 ++++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 9102469749..798600f680 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -216,11 +216,11 @@ in the style of communicating sequential processes
(@dfn{CSP}).")
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux"
"aarch64-linux"))
(license license:bsd-3)))
-(define-public go-1.12
+(define-public go-1.13
(package
(inherit go-1.4)
(name "go")
- (version "1.12.16")
+ (version "1.13.7")
(source
(origin
(method url-fetch)
@@ -228,7 +228,7 @@ in the style of communicating sequential processes
(@dfn{CSP}).")
name version ".src.tar.gz"))
(sha256
(base32
- "1y0x10fsvgpc1x24b9q9y6kv9b0kwf7879am3p0gym2abgc5wvnf"))))
+ "1x21kfpzfkvmqd42pan6nl862m7jjl4niqxxpcgm46awbz645bg4"))))
(arguments
(substitute-keyword-arguments (package-arguments go-1.4)
((#:phases phases)
@@ -367,7 +367,6 @@ in the style of communicating sequential processes
(@dfn{CSP}).")
(docs (string-append doc_out "/share/doc/" ,name "-"
,version))
(src (string-append
(assoc-ref outputs "tests") "/share/" ,name "-"
,version)))
- (delete-file-recursively "../pkg/bootstrap")
;; Prevent installation of the build cache, which contains
;; store references to most of the tools used to build Go and
;; would unnecessarily increase the size of Go's closure if it
@@ -405,7 +404,7 @@ in the style of communicating sequential processes
(@dfn{CSP}).")
,@(package-native-inputs go-1.4)))
(supported-systems %supported-systems)))
-(define-public go go-1.12)
+(define-public go go-1.13)
(define-public go-github-com-alsm-ioprogress
(let ((commit "063c3725f436e7fba0c8f588547bee21ffec7ac5")
diff --git a/guix/build/go-build-system.scm b/guix/build/go-build-system.scm
index 4bc0156a88..3337552d96 100644
--- a/guix/build/go-build-system.scm
+++ b/guix/build/go-build-system.scm
@@ -141,6 +141,10 @@ dependencies, so it should be self-contained."
;; Using the current working directory as GOPATH makes it easier for
packagers
;; who need to manipulate the unpacked source code.
(setenv "GOPATH" (getcwd))
+ ;; Go 1.13 uses go modules by default. The go build system does not
+ ;; currently support modules, so turn modules off to continue using the old
+ ;; GOPATH behavior.
+ (setenv "GO111MODULE" "off")
(setenv "GOBIN" (string-append (assoc-ref outputs "out") "/bin"))
(let ((tmpdir (tmpnam)))
(match (go-inputs inputs)
--
2.25.0