gnu: go@1.4: Update to 1.4-bootstrap-20171003.

* gnu/packages/golang.scm (go-1.4): Use the bootstrap branch that is
still supported upstream.
[version]: Update to 1.4-bootstrap-20171003.
[arguments]: Remove obsolete fix for 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.

Signed-off-by: Leo Famulari <leo@famulari.name>
This commit is contained in:
Alex Griffin 2019-04-20 14:01:17 -05:00 committed by Leo Famulari
parent 8d1647b228
commit 521d736ae9
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 7 additions and 13 deletions

View File

@ -14,6 +14,7 @@
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright @ 2018, 2019 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright @ 2018, 2019 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright @ 2019 Giovanni Biscuolo <g@xelera.eu> ;;; Copyright @ 2019 Giovanni Biscuolo <g@xelera.eu>
;;; Copyright @ 2019 Alex Griffin <a@ajgrf.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -61,14 +62,16 @@
(define-public go-1.4 (define-public go-1.4
(package (package
(name "go") (name "go")
(version "1.4.3") ;; The C-langauge bootstrap of Go:
;; https://golang.org/doc/install/source#go14
(version "1.4-bootstrap-20171003")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://storage.googleapis.com/golang/" (uri (string-append "https://storage.googleapis.com/golang/"
name version ".src.tar.gz")) name version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0na9yqilzpvq0bjndbibfp07wr796gf252y471cip10bbdqgqiwr")))) "0liybk5z00hizsb5ypkbhqcawnwwa6mkwgvjjg4y3jm3ndg5pzzl"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("out" (outputs '("out"
"doc" "doc"
@ -135,13 +138,6 @@
("os/os_test.go" "(.+)(TestHostname.+)") ("os/os_test.go" "(.+)(TestHostname.+)")
("time/format_test.go" "(.+)(TestParseInSydney.+)") ("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" "(.+)(TestEcho.+)")
("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)") ("os/exec/exec_test.go" "(.+)(TestCommandRelativeName.+)")
("os/exec/exec_test.go" "(.+)(TestCatStdin.+)") ("os/exec/exec_test.go" "(.+)(TestCatStdin.+)")
@ -168,9 +164,7 @@
(setenv "GOOS" "linux") (setenv "GOOS" "linux")
(setenv "GOROOT" (dirname (getcwd))) (setenv "GOROOT" (dirname (getcwd)))
(setenv "GOROOT_FINAL" output) (setenv "GOROOT_FINAL" output)
;; Go 1.4's cgo will not work with binutils >= 2.27: (setenv "GO14TESTS" "1")
;; https://github.com/golang/go/issues/16906
(setenv "CGO_ENABLED" "0")
(invoke "sh" "all.bash")))) (invoke "sh" "all.bash"))))
(replace 'install (replace 'install