diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2022-04-05 19:03:57 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2022-04-05 19:03:57 +0200 |
| commit | 66177c2b877bb5b5e3e337096b7850f31d03658b (patch) | |
| tree | f6da997ec2de45f42fb44c37c22fad47ab1fa9c7 | |
| parent | df2dc0c41644477c8cc3ccc958b822f8440114ef (diff) | |
| parent | 27720d0fe14ee4cd413a6745e0782a698a011924 (diff) | |
| download | guix-66177c2b877bb5b5e3e337096b7850f31d03658b.tar.gz | |
Merge branch 'wip-pyyaml'
| -rw-r--r-- | gnu/packages/python-xyz.scm | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 60a13906d1..5b92724a53 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3907,14 +3907,14 @@ environments and back.") (define-public python-pyyaml (package (name "python-pyyaml") - (version "5.4.1") + (version "6.0") (source (origin (method url-fetch) (uri (pypi-uri "PyYAML" version)) (sha256 (base32 - "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0")))) + "18imkjacvpxfgg1lbpraqywx3j7hr5dv99d242byqvrh2jf53yv8")))) (build-system python-build-system) (inputs (list libyaml python-cython)) @@ -3925,10 +3925,21 @@ environments and back.") 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))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-pyyaml)))))) (define-public python2-pyyaml - (package-with-python2 python-pyyaml)) + (let ((base (package-with-python2 (strip-python2-variant python-pyyaml)))) + (package + (inherit base) + (version "5.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyYAML" version)) + (sha256 + (base32 + "0pm440pmpvgv5rbbnm8hk4qga5a292kvlm1bh3x2nwr8pb5p8xv0"))))))) (define-public python-vine (package |