summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-01-15 21:42:15 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-01-16 19:20:20 +0100
commitbd8c62dbd1ef37c5f1a49d7100ca99b1f6f67749 (patch)
tree8351c37ff9f7719f24771b059d38d3fa6f3c2edf
parent1c70205f8277e4dc2f99d0c79a685028d4c64aed (diff)
downloadguix-bd8c62dbd1ef37c5f1a49d7100ca99b1f6f67749.tar.gz
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.
-rw-r--r--gnu/packages/python-compression.scm15
1 files 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 @@ install: libbitshuffle.so
     (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