mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: go: Update to 1.14.4.
* gnu/packages/golang.scm (go): Update to 1.14.4. * gnu/packages/docker.scm (docker)[arguments]: Fix build with go@1.14.4. Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
parent
0f7378d7f9
commit
6e9f882608
2 changed files with 30 additions and 10 deletions
|
@ -4,6 +4,7 @@
|
||||||
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||||
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
|
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
|
||||||
|
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -390,6 +391,17 @@ built-in registry server of Docker.")
|
||||||
(substitute* "pkg/archive/archive.go"
|
(substitute* "pkg/archive/archive.go"
|
||||||
(("string\\{\"xz")
|
(("string\\{\"xz")
|
||||||
(string-append "string{\"" (assoc-ref inputs "xz") "/bin/xz")))
|
(string-append "string{\"" (assoc-ref inputs "xz") "/bin/xz")))
|
||||||
|
;; TODO: Remove when Docker proper uses v1.14.x to build
|
||||||
|
(substitute* "registry/resumable/resumablerequestreader_test.go"
|
||||||
|
(("I%27m%20not%20an%20url" all)
|
||||||
|
(string-append "\"" all "\"")))
|
||||||
|
;; TODO: Remove when Docker proper uses v1.14.x to build
|
||||||
|
(substitute* "vendor/gotest.tools/x/subtest/context.go"
|
||||||
|
(("func \\(tc \\*testcase\\) Cleanup\\(" all)
|
||||||
|
(string-append all "func()"))
|
||||||
|
(("tc\\.Cleanup\\(" all)
|
||||||
|
(string-append all "nil")))
|
||||||
|
|
||||||
(let ((source-files (filter (lambda (name)
|
(let ((source-files (filter (lambda (name)
|
||||||
(not (string-contains name "test")))
|
(not (string-contains name "test")))
|
||||||
(find-files "." "\\.go$"))))
|
(find-files "." "\\.go$"))))
|
||||||
|
@ -488,6 +500,7 @@ built-in registry server of Docker.")
|
||||||
;; Timeouts after 5 min.
|
;; Timeouts after 5 min.
|
||||||
(delete-file "plugin/manager_linux_test.go")
|
(delete-file "plugin/manager_linux_test.go")
|
||||||
;; Operation not permitted.
|
;; Operation not permitted.
|
||||||
|
(delete-file "daemon/graphdriver/aufs/aufs_test.go")
|
||||||
(delete-file "daemon/graphdriver/btrfs/btrfs_test.go")
|
(delete-file "daemon/graphdriver/btrfs/btrfs_test.go")
|
||||||
(delete-file "daemon/graphdriver/overlay/overlay_test.go")
|
(delete-file "daemon/graphdriver/overlay/overlay_test.go")
|
||||||
(delete-file "daemon/graphdriver/overlay2/overlay_test.go")
|
(delete-file "daemon/graphdriver/overlay2/overlay_test.go")
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
|
;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
|
||||||
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
|
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
|
||||||
;;; 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, 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
|
||||||
;;; Copyright @ 2019 Giovanni Biscuolo <g@xelera.eu>
|
;;; Copyright @ 2019 Giovanni Biscuolo <g@xelera.eu>
|
||||||
;;; Copyright @ 2019, 2020 Alex Griffin <a@ajgrf.com>
|
;;; Copyright @ 2019, 2020 Alex Griffin <a@ajgrf.com>
|
||||||
;;; Copyright © 2019, 2020 Arun Isaac <arunisaac@systemreboot.net>
|
;;; Copyright © 2019, 2020 Arun Isaac <arunisaac@systemreboot.net>
|
||||||
|
@ -218,19 +218,21 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
||||||
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux"))
|
(supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux"))
|
||||||
(license license:bsd-3)))
|
(license license:bsd-3)))
|
||||||
|
|
||||||
(define-public go-1.13
|
(define-public go-1.14
|
||||||
(package
|
(package
|
||||||
(inherit go-1.4)
|
(inherit go-1.4)
|
||||||
(name "go")
|
(name "go")
|
||||||
(version "1.13.9")
|
(version "1.14.4")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method git-fetch)
|
||||||
(uri (string-append "https://storage.googleapis.com/golang/"
|
(uri (git-reference
|
||||||
name version ".src.tar.gz"))
|
(url "https://github.com/golang/go.git")
|
||||||
|
(commit (string-append "go" version))))
|
||||||
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"07gksk9194wa90xyd6yhagxfv7syvsx29bh8ypc4mg700vc1kfrl"))))
|
"08bazglmqp123c9dgrxflvxd011xsqfxsgah2kzbvca0mhm6qcm3"))))
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments go-1.4)
|
(substitute-keyword-arguments (package-arguments go-1.4)
|
||||||
((#:system system)
|
((#:system system)
|
||||||
|
@ -266,7 +268,13 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
||||||
'("cmd/go/testdata/script/mod_case_cgo.txt"
|
'("cmd/go/testdata/script/mod_case_cgo.txt"
|
||||||
"cmd/go/testdata/script/list_find.txt"
|
"cmd/go/testdata/script/list_find.txt"
|
||||||
"cmd/go/testdata/script/list_compiled_imports.txt"
|
"cmd/go/testdata/script/list_compiled_imports.txt"
|
||||||
"cmd/go/testdata/script/cgo_syso_issue29253.txt"))
|
"cmd/go/testdata/script/cgo_syso_issue29253.txt"
|
||||||
|
"cmd/go/testdata/script/cover_cgo.txt"
|
||||||
|
"cmd/go/testdata/script/cover_cgo_xtest.txt"
|
||||||
|
"cmd/go/testdata/script/cover_cgo_extra_test.txt"
|
||||||
|
"cmd/go/testdata/script/cover_cgo_extra_file.txt"))
|
||||||
|
|
||||||
|
(for-each make-file-writable (find-files "."))
|
||||||
|
|
||||||
(substitute* "os/os_test.go"
|
(substitute* "os/os_test.go"
|
||||||
(("/usr/bin") (getcwd))
|
(("/usr/bin") (getcwd))
|
||||||
|
@ -369,7 +377,6 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
||||||
(setenv "GOROOT_FINAL" output)
|
(setenv "GOROOT_FINAL" output)
|
||||||
(setenv "CGO_ENABLED" "1")
|
(setenv "CGO_ENABLED" "1")
|
||||||
(invoke "sh" "all.bash"))))
|
(invoke "sh" "all.bash"))))
|
||||||
|
|
||||||
(replace 'install
|
(replace 'install
|
||||||
;; TODO: Most of this could be factorized with Go 1.4.
|
;; TODO: Most of this could be factorized with Go 1.4.
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
|
@ -415,7 +422,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
|
||||||
,@(package-native-inputs go-1.4)))
|
,@(package-native-inputs go-1.4)))
|
||||||
(supported-systems %supported-systems)))
|
(supported-systems %supported-systems)))
|
||||||
|
|
||||||
(define-public go go-1.13)
|
(define-public go go-1.14)
|
||||||
|
|
||||||
(define-public go-github-com-alsm-ioprogress
|
(define-public go-github-com-alsm-ioprogress
|
||||||
(let ((commit "063c3725f436e7fba0c8f588547bee21ffec7ac5")
|
(let ((commit "063c3725f436e7fba0c8f588547bee21ffec7ac5")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue