From bd8c62dbd1ef37c5f1a49d7100ca99b1f6f67749 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Jan 2020 21:42:15 +0100 Subject: [PATCH] gnu: python-zipp: Remove redundant inputs. The Python 3 variant do not need these. * gnu/packages/python-compression.scm (python-zipp)[native-inputs]: Remove PYTHON-CONTEXTLIB2, PYTHON-PATHLIB2, and PYTHON-UNITTEST2. [properties]: New field. (python2-zipp)[native-inputs]: Add PYTHON2-CONTEXTLIB2, PYTHON2-PATHLIB2, and PYTHON2-UNITTEST2. --- gnu/packages/python-compression.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 7de5be72a1..70abc7bad1 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -223,20 +223,25 @@ (define-public python-zipp (propagated-inputs `(("python-more-itertools" ,python-more-itertools))) (native-inputs - `(("python-contextlib2" ,python-contextlib2) - ("python-pathlib2" ,python-pathlib2) - ("python-setuptools-scm" ,python-setuptools-scm) - ("python-unittest2" ,python-unittest2))) + `(("python-setuptools-scm" ,python-setuptools-scm))) (home-page "https://github.com/jaraco/zipp") (synopsis "Backport of pathlib-compatible object wrapper for zip files") (description "This package provides a @code{pathlib}-compatible @code{Zipfile} object wrapper. It provides a backport of the @code{Path} object.") + (properties `((python2-variant . ,(delay python2-zipp)))) (license license:expat))) (define-public python2-zipp - (package-with-python2 python-zipp)) + (let ((base (package-with-python2 (strip-python2-variant python-zipp)))) + (package/inherit + base + (native-inputs + `(("python-contextlib2" ,python2-contextlib2) + ("python-pathlib2" ,python2-pathlib2) + ("python-unittest2" ,python2-unittest2) + ,@(package-native-inputs base)))))) (define-public python-zstandard (package