amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: go: Update to 1.14.4.

Browse source 
* 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:
Katherine Cox-Buday 2020-06-03 18:31:00 -05:00 • committed by Christopher Baines
parent 0f7378d7f9
commit 6e9f882608
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
2 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/docker.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -390,6 +391,17 @@ built-in registry server of Docker.")
(substitute* "pkg/archive/archive.go"
(("string\\{\"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)
(not (string-contains name "test")))
(find-files "." "\\.go$"))))
@ -488,6 +500,7 @@ built-in registry server of Docker.")
;; Timeouts after 5 min.
(delete-file "plugin/manager_linux_test.go")
;; Operation not permitted.
(delete-file "daemon/graphdriver/aufs/aufs_test.go")
(delete-file "daemon/graphdriver/btrfs/btrfs_test.go")
(delete-file "daemon/graphdriver/overlay/overlay_test.go")
(delete-file "daemon/graphdriver/overlay2/overlay_test.go")