diff mbox

[WIP,1/8] gnu: ensure pip and setuptools are installed even for Python 2.

Message ID 1476111439-20812-2-git-send-email-h.goebel@crazy-compilers.com
State New
Headers show

Commit Message

Hartmut Goebel Oct. 10, 2016, 2:57 p.m. UTC
* gnu/packages/python.scm (python-2.7): Add "--with-ensurepip=install" to
  configure-flags.
* doc/guix.texi (Python Modules): Document it.
---
 doc/guix.texi           | 3 +++
 gnu/packages/python.scm | 1 +
 2 files changed, 4 insertions(+)
diff mbox

Patch

diff --git a/doc/guix.texi b/doc/guix.texi
index 57821c5..02f7486 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -12250,6 +12250,9 @@  for instance, the module python-dateutil is packaged under the names
 starts with @code{py} (e.g. @code{pytz}), we keep it and prefix it as
 described above.
 
+We currently package Python 2 with @code{setuptools} and @code{pip}
+installed like Python 3.4 has per default.  Thus you don't need to
+specify either of these as an input.
 
 @node Perl Modules
 @subsection Perl Modules
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9b62241..2bdac60 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -156,6 +156,7 @@ 
        #:configure-flags
        (list "--enable-shared"                    ;allow embedding
              "--with-system-ffi"                  ;build ctypes
+             "--with-ensurepip=install"           ;install pip and setuptools
              (string-append "LDFLAGS=-Wl,-rpath="
                             (assoc-ref %outputs "out") "/lib"))