gnu: go: Update to 1.7.
* gnu/packages/golang.scm (go-1.6): Update to 1.7, with corresponding minor changes to prebuild phase, and rename variable to... (go-1.7): ...this new variable. (go): Inherit from new "go-1.7". Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
parent
a287fafef2
commit
a61696216c
|
@ -3,6 +3,7 @@
|
||||||
;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
|
;;; Copyright © 2016 Matthew Jordan <matthewjordandevops@yandex.com>
|
||||||
;;; Copyright © 2016 Andy Wingo <wingo@igalia.com>
|
;;; Copyright © 2016 Andy Wingo <wingo@igalia.com>
|
||||||
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
|
||||||
|
;;; Copyright © 2016 Petter <petter@mykolab.ch>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is an addendum GNU Guix.
|
;;; This file is an addendum GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -185,11 +186,11 @@ (define-public go-1.4
|
||||||
sequential processes (CSP) concurrent programming features added.")
|
sequential processes (CSP) concurrent programming features added.")
|
||||||
(license license:bsd-3)))
|
(license license:bsd-3)))
|
||||||
|
|
||||||
(define-public go-1.6
|
(define-public go-1.7
|
||||||
(package
|
(package
|
||||||
(inherit go-1.4)
|
(inherit go-1.4)
|
||||||
(name "go")
|
(name "go")
|
||||||
(version "1.6.3")
|
(version "1.7")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -197,7 +198,7 @@ (define-public go-1.6
|
||||||
name version ".src.tar.gz"))
|
name version ".src.tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"002v6irgfd63zp9iza8nski5by0lar033j3ddpqiikw6bznsw9k3"))))
|
"1h712yd5wk5mrj2dixc9z2xlgksfks00yvglrkrgr488p8b0qs3j"))))
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments go-1.4)
|
(substitute-keyword-arguments (package-arguments go-1.4)
|
||||||
((#:phases phases)
|
((#:phases phases)
|
||||||
|
@ -216,11 +217,14 @@ (define-public go-1.6
|
||||||
;; Removing net/ tests, which fail when attempting to access
|
;; Removing net/ tests, which fail when attempting to access
|
||||||
;; network resources not present in the build container.
|
;; network resources not present in the build container.
|
||||||
(for-each delete-file
|
(for-each delete-file
|
||||||
'("net/listen_test.go" "net/parse_test.go"))
|
'("net/listen_test.go"
|
||||||
|
"net/parse_test.go"
|
||||||
|
"net/cgo_unix_test.go"))
|
||||||
|
|
||||||
(substitute* "os/os_test.go"
|
(substitute* "os/os_test.go"
|
||||||
(("/usr/bin") (getcwd))
|
(("/usr/bin") (getcwd))
|
||||||
(("/bin/pwd") (which "pwd")))
|
(("/bin/pwd") (which "pwd"))
|
||||||
|
(("/bin/sh") (which "sh")))
|
||||||
|
|
||||||
;; Add libgcc to runpath
|
;; Add libgcc to runpath
|
||||||
(substitute* "cmd/link/internal/ld/lib.go"
|
(substitute* "cmd/link/internal/ld/lib.go"
|
||||||
|
@ -275,7 +279,7 @@ (define-public go-1.6
|
||||||
|
|
||||||
;; fix shebang for testar script
|
;; fix shebang for testar script
|
||||||
;; note the target script is generated at build time.
|
;; note the target script is generated at build time.
|
||||||
(substitute* "../misc/cgo/testcarchive/test.bash"
|
(substitute* "../misc/cgo/testcarchive/carchive_test.go"
|
||||||
(("#!/usr/bin/env") (string-append "#!" (which "env"))))
|
(("#!/usr/bin/env") (string-append "#!" (which "env"))))
|
||||||
|
|
||||||
(substitute* "net/lookup_unix.go"
|
(substitute* "net/lookup_unix.go"
|
||||||
|
@ -336,4 +340,4 @@ (define-public go-1.6
|
||||||
`(("go" ,go-1.4)
|
`(("go" ,go-1.4)
|
||||||
,@(package-native-inputs go-1.4)))))
|
,@(package-native-inputs go-1.4)))))
|
||||||
|
|
||||||
(define-public go go-1.6)
|
(define-public go go-1.7)
|
||||||
|
|
Loading…
Reference in a new issue