Subject: [bug#54866] [PATCH] docker-compose, python-pyyaml

From: [email-masked]
Date: Tue, 12 Apr 2022 00:28:51 +0200

Hi Guix,

I noticed that after my last pull to 6413d0898b92, docker-compose did
not build anymore. The backtrace showed that it fails in the sanity-
check-phase due to the requirement python-pyyaml <6.

As it builds nicely on guix 9bd4ed3, which still features
[email-masked] I took the definition from there, re-added it to
python-xyz.scm and adjusted docker-compose in docker.scm.  You find the
patchfile attached, as evolution seems to mess with line-breaks
(docker-compose build tested on x86_64 only, as I don't have anything
else around).

Best & thanks for your great work,
Daniel
From eab4590fe2c9726920dbe07202616908065dad62 Mon Sep 17 00:00:00 2001
From: Daniel <[email-masked]>
Date: Tue, 12 Apr 2022 00:04:27 +0200
Subject: [PATCH] re-adding [email-masked] for compatibility with
 [email-masked]

---
 gnu/packages/docker.scm     |  2 +-
 gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 3f52f4f8db..07731886ae 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -122,7 +122,7 @@ (define-public docker-compose
            python-docopt
            python-dotenv
            python-jsonschema
-           python-pyyaml
+           python-pyyaml-5
            python-requests
            python-six
            python-texttable
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index e83eb017f5..12b538594e 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3928,6 +3928,30 @@ (define-public python-pyyaml
     (license license:expat)
     (properties `((python2-variant . ,(delay python2-pyyaml))))))
 
+;; for docker-compose 1.29.2 compatibility
+(define-public python-pyyaml-5
+  (package
+    (name "python-pyyaml")
+    (version "5.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "PyYAML" version))
+       (sha256
+	(base32
+	 "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0"))))
+    (build-system python-build-system)
+    (inputs
+     (list libyaml python-cython))
+    (home-page "https://pyyaml.org")
+    (synopsis "YAML parser and emitter for Python")
+    (description
+     "PyYAML is a YAML parser and emitter for Python.  PyYAML features a
+complete YAML 1.1 parser, Unicode support, pickle support, capable extension
+API, and sensible error messages.  PyYAML supports standard YAML tags and
+provides Python-specific tags that represent an arbitrary Python object.")
+    (license license:expat)))
+
 (define-public python2-pyyaml
   (let ((base (package-with-python2 (strip-python2-variant python-pyyaml))))
     (package

base-commit: 6413d0898b92efda8213b3ced0b6d1c736726b89
-- 
2.35.1