From 53f826cd0f429864d46fc3bf6305c14356d0b2ad Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 7 Feb 2018 17:05:23 +0100 Subject: [PATCH] gnu: python2-tqdm: Work around missing flake8 propagation. * gnu/packages/python.scm (python-tqdm)[properties]: Declare python2 variant. (python2-tqdm): Use STRIP-PYTHON2-VARIANT. [native-inputs]: Add PYTHON-ENUM34. --- gnu/packages/python.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6013c31acb..40c6077951 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11929,10 +11929,18 @@ (define-public python-tqdm "Make loops show a progress bar on the console by just wrapping any iterable with @code{|tqdm(iterable)|}. Offers many options to define design and layout.") - (license (list license:mpl2.0 license:expat)))) + (license (list license:mpl2.0 license:expat)) + (properties `((python2-variant . ,(delay python2-tqdm)))))) (define-public python2-tqdm - (package-with-python2 python-tqdm)) + (let ((tqdm (package-with-python2 + (strip-python2-variant python-tqdm)))) + (package + (inherit tqdm) + (native-inputs + ;; FIXME: This should be propagated from python2-flake8 instead. + `(("python2-enum34" ,python2-enum34) + ,@(package-native-inputs tqdm)))))) (define-public python-pkginfo (package