gnu: ensure pip and setuptools are installed even for Python 2.

* gnu/packages/python.scm (python-2.7): Add "--with-ensurepip=install" to
  configure-flags.
* doc/guix.texi (Python Modules): Document it.
This commit is contained in:
Hartmut Goebel 2016-09-28 10:36:45 +02:00
parent 043a51c0c2
commit aaf75c890b
No known key found for this signature in database
GPG Key ID: 634A8DFFD3F631DF
2 changed files with 7 additions and 3 deletions

View File

@ -13579,7 +13579,6 @@ 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 starts with @code{py} (e.g. @code{pytz}), we keep it and prefix it as
described above. described above.
@subsubsection Specifying Dependencies @subsubsection Specifying Dependencies
@cindex inputs, for Python packages @cindex inputs, for Python packages
@ -13595,6 +13594,11 @@ following check list to determine which dependency goes where.
@itemize @itemize
@item
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.
@item @item
Python dependencies required at run time go into Python dependencies required at run time go into
@code{propagated-inputs}. They are typically defined with the @code{propagated-inputs}. They are typically defined with the
@ -13609,8 +13613,7 @@ testing---e.g., those in @code{tests_require}---go into
propagated because they are not needed at run time, and (2) in a propagated because they are not needed at run time, and (2) in a
cross-compilation context, it's the ``native'' input that we'd want. cross-compilation context, it's the ``native'' input that we'd want.
Examples are @code{setuptools}, which is usually needed only at build Examples are the @code{pytest}, @code{mock}, and @code{nose} test
time, or the @code{pytest}, @code{mock}, and @code{nose} test
frameworks. Of course if any of these packages is also required at frameworks. Of course if any of these packages is also required at
run-time, it needs to go to @code{propagated-inputs}. run-time, it needs to go to @code{propagated-inputs}.

View File

@ -162,6 +162,7 @@
#:configure-flags #:configure-flags
(list "--enable-shared" ;allow embedding (list "--enable-shared" ;allow embedding
"--with-system-ffi" ;build ctypes "--with-system-ffi" ;build ctypes
"--with-ensurepip=install" ;install pip and setuptools
(string-append "LDFLAGS=-Wl,-rpath=" (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out") "/lib")) (assoc-ref %outputs "out") "/lib"))