diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-02-03 11:45:00 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-03 12:54:50 +0100 |
| commit | 5d8c7f2f596f0445cebc46b194370f2146ed1e29 (patch) | |
| tree | 027cb9205e59f73e08be204910d634232ca18023 | |
| parent | 0684a2f907151c20cee1643873547f7968fcbfa0 (diff) | |
| download | guix-5d8c7f2f596f0445cebc46b194370f2146ed1e29.tar.gz | |
gnu: python2-importlib-metadata: Fix circular dependency.
Commit 0684a2f907151c20cee1643873547f7968fcbfa0 introduced a circular dependency in the Python 2 variant of python-importlib-metadata. * gnu/packages/python-xyz.scm (python-importlib-metadata)[native-inputs]: Remove PYTHON-SIX and PYTHON-PACKAGING-BOOTSTRAP. Add PYTHON-PACKAGING. (python2-importlib-metadata)[native-inputs]: New field.
| -rw-r--r-- | gnu/packages/python-xyz.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index abaec7f699..5a1ff5bc97 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5029,8 +5029,7 @@ for older versions of Python.") `(("python-zipp" ,python-zipp))) (native-inputs `(("python-setuptools-scm" ,python-setuptools-scm) - ("python-six" ,python-six) - ("python-packaging" ,python-packaging-bootstrap))) + ("python-packaging" ,python-packaging))) (home-page "https://importlib-metadata.readthedocs.io/") (synopsis "Read metadata from Python packages") (description @@ -5049,6 +5048,9 @@ need to use the older and less efficient @code{pkg_resources} package.") (package/inherit base (name "python2-importlib-metadata") + (native-inputs + `(("python-packaging" ,python2-packaging-bootstrap) + ,@(alist-delete "python-packaging" (package-native-inputs base)))) (propagated-inputs `(("python-configparser" ,python2-configparser) ("python-contextlib2" ,python2-contextlib2) |