From 7c9a1d5e8056a566780a2c2a026127d40096fa56 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Feb 2018 17:55:53 +0100 Subject: Revert "Revert "gnu: python2-flake8: Fix python-enum34 propagation."" This reverts commit b7049b2e23a514a1d9c131af484e808ee0ee4226. --- gnu/packages/python.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5bbe472da6..b03382ca17 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -5465,7 +5465,7 @@ complexity of Python source code.") (package (inherit base) (propagated-inputs `(("python2-configparser" ,python2-configparser) - ("python2-enum" ,python2-enum) + ("python2-enum34" ,python2-enum34) ,@(package-propagated-inputs base)))))) ;; python-hacking requires flake8 <2.6.0. -- cgit v1.3 From 49057c8fc17e0f7135a98a57f2bdd338b96cb536 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Feb 2018 17:56:06 +0100 Subject: Revert "gnu: python2-tqdm: Work around missing flake8 propagation." This reverts commit 53f826cd0f429864d46fc3bf6305c14356d0b2ad. --- gnu/packages/python.scm | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'gnu/packages/python.scm') diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b03382ca17..3e410b0a51 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11979,18 +11979,10 @@ ignoring formatting changes.") "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)) - (properties `((python2-variant . ,(delay python2-tqdm)))))) + (license (list license:mpl2.0 license:expat)))) (define-public python2-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)))))) + (package-with-python2 python-tqdm)) (define-public python-pkginfo (package -- cgit v1.3