GNU bug report logs - #22808
Add a function to simplify many of the new python2-foo definitions

Previous Next

Full log

View this message in rfc822 format

From: ludo <at> gnu.org (Ludovic Courtès)
To: Christopher Allan Webber <cwebber <at> dustycloud.org>
Cc: 22808 <at> debbugs.gnu.org
Subject: bug#22808: Add a function to simplify many of the new python2-foo definitions
Date: Tue, 26 Apr 2016 11:54:28 +0200

[Message part 1 (text/plain, inline)]

ludo <at> gnu.org (Ludovic Courtès) skribis:

> Christopher Allan Webber <cwebber <at> 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:

[Message part 2 (text/x-patch, inline)]

--- 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")

[Message part 3 (text/plain, inline)]

Then we need to change all the occurrences of this pattern to use this
new procedure.

Thoughts?

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.