diff options
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | doc/guix.texi | 14 |
2 files changed, 16 insertions, 1 deletions
| @@ -23,6 +23,9 @@ GNU Guix currently depends on the following packages: | |||
| 23 | - [[http://gnu.org/software/guile/][GNU Guile 2.0.x]], version 2.0.5 or later | 23 | - [[http://gnu.org/software/guile/][GNU Guile 2.0.x]], version 2.0.5 or later |
| 24 | - [[http://gnupg.org/][GNU libgcrypt]] | 24 | - [[http://gnupg.org/][GNU libgcrypt]] |
| 25 | - optionally [[http://savannah.nongnu.org/projects/guile-json/][Guile-JSON]], for the 'guix import pypi' command | 25 | - optionally [[http://savannah.nongnu.org/projects/guile-json/][Guile-JSON]], for the 'guix import pypi' command |
| 26 | - optionally [[http://www.gnutls.org][GnuTLS]] compiled with guile support enabled, for HTTPS support | ||
| 27 | in the 'guix download' command. Note that 'guix import pypi' requires | ||
| 28 | this functionality. | ||
| 26 | 29 | ||
| 27 | Unless `--disable-daemon' was passed, the following packages are needed: | 30 | Unless `--disable-daemon' was passed, the following packages are needed: |
| 28 | 31 | ||
diff --git a/doc/guix.texi b/doc/guix.texi index f2b652762dc..d3ab9676eed 100644 --- a/doc/guix.texi +++ b/doc/guix.texi | |||
| @@ -157,11 +157,23 @@ GNU Guix depends on the following packages: | |||
| 157 | @itemize | 157 | @itemize |
| 158 | @item @url{http://gnu.org/software/guile/, GNU Guile}, version 2.0.5 or later; | 158 | @item @url{http://gnu.org/software/guile/, GNU Guile}, version 2.0.5 or later; |
| 159 | @item @url{http://gnupg.org/, GNU libgcrypt}; | 159 | @item @url{http://gnupg.org/, GNU libgcrypt}; |
| 160 | @end itemize | ||
| 161 | |||
| 162 | The following dependencies are optional: | ||
| 163 | |||
| 164 | @itemize | ||
| 160 | @item | 165 | @item |
| 161 | optionally, installing | 166 | Installing |
| 162 | @url{http://savannah.nongnu.org/projects/guile-json/, Guile-JSON} will | 167 | @url{http://savannah.nongnu.org/projects/guile-json/, Guile-JSON} will |
| 163 | allow you to use the @command{guix import pypi} command; it is of | 168 | allow you to use the @command{guix import pypi} command; it is of |
| 164 | interest primarily for developers and not for casual users. | 169 | interest primarily for developers and not for casual users. |
| 170 | @item | ||
| 171 | Installing @uref{http://gnutls.org/, GnuTLS-Guile} will | ||
| 172 | allow you to access @code{https} URLs with the @command{guix download} | ||
| 173 | command (@pxref{Invoking guix download}) and the @command{guix import | ||
| 174 | pypi} command. This is primarily of interest to developers. | ||
| 175 | @xref{Guile Preparations, how to install the GnuTLS bindings for Guile,, | ||
| 176 | gnutls-guile, GnuTLS-Guile}. | ||
| 165 | @end itemize | 177 | @end itemize |
| 166 | 178 | ||
| 167 | Unless @code{--disable-daemon} was passed to @command{configure}, the | 179 | Unless @code{--disable-daemon} was passed to @command{configure}, the |
