From 8d53a088520bccc063b7eaf1936b6e2dbed7f9ba Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sat, 9 Aug 2025 15:08:31 -0400 Subject: [PATCH] gnu: Add python-docker-5. This is a followup to commit 3eb1ceac58985c0407f3ade1cfa72dbee1b7886a along with an upcoming commit to use this in docker-compose to fully fix it. This package is added just for the old version 1 of docker-compose and should be removed once Docker is updated (which includes "docker compose" v2 built-in). * gnu/packages/docker.scm (python-docker-5): New variable. Change-Id: I9e640ca3a87fb6e055524cd5acc79588ac36fe36 --- gnu/packages/docker.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 8c7e4e88e7a9468866fca2414a9c19a75b4a62d6..3a3a935fee201e8eaa13b47f7a9f908eecb9219e 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2024 Nicolas Graves ;;; Copyright © 2025 Artyom V. Poptsov ;;; Copyright © 2025 Vinicius Monego +;;; Copyright © 2025 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -103,6 +104,33 @@ management tool.") (license license:asl2.0))) +;; Needed for old v1 of docker-compose; remove once Docker is updated to a +;; more recent version which has the command "docker compose" built-in. +(define-public python-docker-5 + (package + (inherit python-docker) + (name "python-docker") + (version "5.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/docker/docker-py") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0m5ifgxdhcf7yci0ncgnxjas879sksrf3im0fahs573g268farz9")))) + (build-system python-build-system) + ;; Integration tests need a running Docker daemon. + (arguments (list #:tests? #f)) + (native-inputs '()) + (inputs (modify-inputs (package-inputs python-docker) + (prepend python-six) + (delete "python-urllib3"))) + (propagated-inputs + (modify-inputs (package-propagated-inputs python-docker) + (prepend python-docker-pycreds python-urllib3-1.26))))) + (define-public python-dockerpty (package (name "python-dockerpty")