diff options
author | Katherine Cox-Buday <cox.katherine.e@gmail.com> | 2020-06-03 18:31:00 -0500 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2020-06-25 17:47:32 +0100 |
commit | cbef56540c328064ffd87b5c1e7af9cc3d520b25 (patch) | |
tree | 7338bf26de785b29a82a6ee3f91a76df20a26dd1 /gnu/packages/docker.scm | |
parent | d613991a8ebe5d4b3a7706f8f0dd52f16fc1c50a (diff) | |
download | guix-cbef56540c328064ffd87b5c1e7af9cc3d520b25.tar guix-cbef56540c328064ffd87b5c1e7af9cc3d520b25.tar.gz |
gnu: go: Update to 1.14.4.update-go-to-1.14.4
* gnu/packages/golang.scm (go): Update to 1.14.4.
* gnu/packages/docker.scm (docker, docker-cli): Update to 19.03.11.
Diffstat (limited to 'gnu/packages/docker.scm')
-rw-r--r-- | gnu/packages/docker.scm | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index cdde807046..3dd706cbe9 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -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") |