l...@gnu.org (Ludovic Courtès) skribis: > Christopher Allan Webber <cweb...@dustycloud.org> skribis: > >> Right now we have a lot of these that look very similar: >> >> (define-public python2-chardet >> (package >> (inherit (package-with-python2 >> (strip-python2-variant python-chardet))) >> (native-inputs `(("python2-setuptools" ,python2-setuptools))))) > > Right, we discussed before adding the python2-setuptools dependency > automatically as part of ‘package-with-python2’. I think this would be > a good idea, indeed.
What about this:
--- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -345,6 +345,14 @@ instead of @command{python3}."))) (define-public python-wrapper (wrap-python3 python)) (define-public python-minimal-wrapper (wrap-python3 python-minimal)) +(define (package-with-python2+setuptools p) + (let ((base (package-with-python2 (strip-python2-variant p)))) + (package + (inherit base) + (native-inputs `(("python2-setuptools" ,python2-setuptools) + ,@(package-native-inputs base)))))) + + (define-public python-psutil (package (name "python-psutil")
Then we need to change all the occurrences of this pattern to use this new procedure. Thoughts? Ludo’.