diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-11-29 14:19:55 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-11-29 17:34:18 +0000 |
| commit | ff01206345e2306cc633db48e0b29eab9077091a (patch) | |
| tree | 25c7ee17005dadc9bf4fae3f0873e03a4704f782 /gnu/packages/docker.scm | |
| parent | ed2545f0fa0e2ad99d5a0c45f532c539b299b9fb (diff) | |
| parent | 7c2e67400ffaef8eb6f30ef7126c976ee3d7e36c (diff) | |
| download | guix-ff01206345e2306cc633db48e0b29eab9077091a.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/docker.scm')
| -rw-r--r-- | gnu/packages/docker.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b130298a04..950986045e 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2019, 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com> @@ -70,11 +70,11 @@ (inputs `(("python-requests" ,python-requests-2.20) ("python-six" ,python-six) - ("python-urllib3" ,python-urllib3-1.24) - ("python-websocket-client" ,python-websocket-client))) + ("python-urllib3" ,python-urllib3-1.24))) (propagated-inputs `(("python-docker-pycreds" ,python-docker-pycreds) - ("python-paramiko" ,python-paramiko))) ; adds SSH support + ("python-paramiko" ,python-paramiko) ;adds SSH support + ("python-websocket-client" ,python-websocket-client))) (home-page "https://github.com/docker/docker-py/") (synopsis "Python client for Docker") (description "Docker-Py is a Python client for the Docker container @@ -671,7 +671,7 @@ provisioning etc.") (define-public cqfd (package (name "cqfd") - (version "5.1.0") + (version "5.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -680,7 +680,7 @@ provisioning etc.") (file-name (git-file-name name version)) (sha256 (base32 - "1xhydz01f2rrnw7rmnaxh3f3q1ariq7j2ig0i0w1p3wn10l3q0nv")))) + "1zqgznfl7slfrddfpy2pfmablbvyf7296d3b3vcprilqb93cc7li")))) (build-system gnu-build-system) (arguments ;; The test suite requires a docker daemon and connectivity. |