diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:08:16 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-20 23:08:16 +0200 |
| commit | 651478aa18a3f575d3b4cc14166a15a1c45b0f61 (patch) | |
| tree | 87c27dc9eff3d321f7ad4a622b110c517856a104 /gnu/packages/docker.scm | |
| parent | 71c08ee60bb3f62bac0614888fb62405f7a388ab (diff) | |
| parent | 9a2e5fe5fdcc6ea848ceeefa0f70147dfb360639 (diff) | |
| download | patches-651478aa18a3f575d3b4cc14166a15a1c45b0f61.tar patches-651478aa18a3f575d3b4cc14166a15a1c45b0f61.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/docker.scm')
| -rw-r--r-- | gnu/packages/docker.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index eb76b85676..bb981665d6 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -91,6 +91,8 @@ pseudo-terminal (PTY) allocated to a Docker container using the Python client.") (license license:asl2.0))) +;; When updating, check whether python-jsonschema-2.6 can be removed from Guix +;; entirely. (define-public docker-compose (package (name "docker-compose") @@ -107,9 +109,10 @@ client.") (arguments '(#:tests? #f)) (inputs `(("python-docker-py" ,python-docker-py) + ("python-docker-pycreds" ,python-docker-pycreds) ("python-dockerpty" ,python-dockerpty) ("python-docopt" ,python-docopt) - ("python-jsonschema" ,python-jsonschema) + ("python-jsonschema" ,python-jsonschema-2.6) ("python-pyyaml" ,python-pyyaml) ("python-requests" ,python-requests-2.7) ("python-six" ,python-six) |