diff options
author | Marius Bakke <marius@gnu.org> | 2020-11-22 23:36:09 +0100 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-11-22 23:36:09 +0100 |
commit | a485a98ca8296d760251e9d870583117ac50979e (patch) | |
tree | 792df6983c0e52403a6c3b82c804f295369a9b1d /gnu/packages/docker.scm | |
parent | 84d1b500f078b619daba35864c703890bd91e5c2 (diff) | |
parent | 1ca0c348674dd4dec2ccb5a2d79b4cfd03a631ef (diff) | |
download | guix-patches-a485a98ca8296d760251e9d870583117ac50979e.tar guix-patches-a485a98ca8296d760251e9d870583117ac50979e.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/docker.scm')
-rw-r--r-- | gnu/packages/docker.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index c08f6eb3c6..950986045e 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -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 |