From 2c7802d2e0a81b70fb7c3bd8d1def65c0bd27771 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Jul 2020 11:15:10 +0300 Subject: gnu: python-humanfriendly: Don't propagate python-monotonic. python-monotonic targets python-2 and early versions of python-3. * gnu/packages/python-xyz.scm (python-humanfriendly)[propagated-inputs]: Remove python-monotonic. [properties]: New field. (python2-humanfriendly): Adjust accordingly. --- gnu/packages/python-xyz.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 110d303818..cdc09bcc1b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1136,8 +1136,6 @@ multiple Unicode code points, e.g. \"G\" + acute-accent) (arguments `(;; XXX: Tests depend on coloredlogs, which in turn depends on humanfriendly. #:tests? #f)) - (propagated-inputs - `(("python-monotonic" ,python-monotonic))) (home-page "https://humanfriendly.readthedocs.io") (synopsis "Human-friendly input and output in Python") (description @@ -1146,10 +1144,16 @@ text interfaces more user-friendly. It includes tools to parse and format numbers, file sizes, and timespans, timers for long-running operations, menus to allow the user to choose from a list of options, and terminal interaction helpers.") + (properties `((python2-variant . ,(delay python2-humanfriendly)))) (license license:expat))) (define-public python2-humanfriendly - (package-with-python2 python-humanfriendly)) + (let ((base (package-with-python2 + (strip-python2-variant python-humanfriendly)))) + (package (inherit base) + (propagated-inputs + `(("python2-monotonic" ,python2-monotonic) + ,@(package-propagated-inputs base)))))) (define-public python-textparser (package -- cgit v1.2.3