(address . guix-patches@gnu.org)
6d838647-e07c-4713-a5a4-c43ec57cf526@www.fastmail.com
The Go bootstrap compiler in Guix currently includes a couple unnecessary workarounds for bugs which have already been fixed. This patch switches to using the bootstrap branch which is still maintained upstream.
--
Alex Griffin
From 4d784a54e5736d2eaeac2a6e9ed14c7d11598705 Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Sat, 20 Apr 2019 14:01:17 -0500
Subject: [PATCH] gnu: go@1.4: Update to 1.4-bootstrap-20171003.
* gnu/packages/golang.scm (go-1.4): Use the bootstrap branch that is
still support upstream.
[version]: Update to 1.4-bootstrap-20171003.
[arguments]: Remove fix to timezone test which is now included upstream. Don't
manually disable CGO because it is disabled by default. Manually enable test
suite because future releases will disable tests by default.
---
gnu/packages/golang.scm | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
Toggle diff (57 lines)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0b44bd3d02..3bd1c3eb8f 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -14,6 +14,7 @@
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright @ 2018, 2019 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright @ 2019 Giovanni Biscuolo <g@xelera.eu>
+;;; Copyright @ 2019 Alex Griffin <a@ajgrf.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -61,14 +62,14 @@
(define-public go-1.4
(package
(name "go")
- (version "1.4.3")
+ (version "1.4-bootstrap-20171003")
(source (origin
(method url-fetch)
(uri (string-append "https://storage.googleapis.com/golang/"
- name version ".src.tar.gz"))
+ name version ".tar.gz"))
(sha256
(base32
- "0na9yqilzpvq0bjndbibfp07wr796gf252y471cip10bbdqgqiwr"))))
+ "0liybk5z00hizsb5ypkbhqcawnwwa6mkwgvjjg4y3jm3ndg5pzzl"))))
(build-system gnu-build-system)
(outputs '("out"
"doc"
@@ -135,13 +136,6 @@
("os/os_test.go" "(.+)(TestHostname.+)")
("time/format_test.go" "(.+)(TestParseInSydney.+)")
- ;; Tzdata 2016g changed the name of the time zone used in this
- ;; test, and the patch for Go 1.7 does not work for 1.4.3:
- ;; https://github.com/golang/go/issues/17545
- ;; https://github.com/golang/go/issues/17276
- ("time/time_test.go" "(.+)(TestLoadFixed.+)")
- ("time/format_test.go" "(.+)(TestParseInLocation.+)")
-
("os/exec/exec_test.go" "(.+)(TestEcho.+)")
("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)")
("os/exec/exec_test.go" "(.+)(TestCatStdin.+)")
@@ -168,9 +162,7 @@
(setenv "GOOS" "linux")
(setenv "GOROOT" (dirname (getcwd)))
(setenv "GOROOT_FINAL" output)
- ;; Go 1.4's cgo will not work with binutils >= 2.27:
- ;; https://github.com/golang/go/issues/16906
- (setenv "CGO_ENABLED" "0")
+ (setenv "GO14TESTS" "1")
(invoke "sh" "all.bash"))))
(replace 'install
--
2.20.1