aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Denhardt <ian@zenhack.net>2014-10-26 01:21:22 -0400
committerLudovic Courtès <ludo@gnu.org>2014-10-27 13:53:46 +0100
commit8a96bd4bb0f0b67f535ab84d22d1275436fa0b8e (patch)
treec333c528761e4027dcdb30bbe4c4bf6358d23d3b
parent537c8bb3fc882ef266a9e98b86a9073edec32273 (diff)
downloadguix-8a96bd4bb0f0b67f535ab84d22d1275436fa0b8e.tar
guix-8a96bd4bb0f0b67f535ab84d22d1275436fa0b8e.tar.gz
doc: Add a note about optional GnuTLS dependency.
* README (Requirements): add a note about 'guix download''s GnuTLS dependency. * doc/guix.texi (Requirements): Likewise. Co-authored-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--README3
-rw-r--r--doc/guix.texi14
2 files changed, 16 insertions, 1 deletions
diff --git a/README b/README
index 3e9e9722ac..2d5e4492d0 100644
--- a/README
+++ b/README
@@ -23,6 +23,9 @@ GNU Guix currently depends on the following packages:
- [[http://gnu.org/software/guile/][GNU Guile 2.0.x]], version 2.0.5 or later
- [[http://gnupg.org/][GNU libgcrypt]]
- optionally [[http://savannah.nongnu.org/projects/guile-json/][Guile-JSON]], for the 'guix import pypi' command
+ - optionally [[http://www.gnutls.org][GnuTLS]] compiled with guile support enabled, for HTTPS support
+ in the 'guix download' command. Note that 'guix import pypi' requires
+ this functionality.
Unless `--disable-daemon' was passed, the following packages are needed:
diff --git a/doc/guix.texi b/doc/guix.texi
index f2b652762d..d3ab9676ee 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -157,11 +157,23 @@ GNU Guix depends on the following packages:
@itemize
@item @url{http://gnu.org/software/guile/, GNU Guile}, version 2.0.5 or later;
@item @url{http://gnupg.org/, GNU libgcrypt};
+@end itemize
+
+The following dependencies are optional:
+
+@itemize
@item
-optionally, installing
+Installing
@url{http://savannah.nongnu.org/projects/guile-json/, Guile-JSON} will
allow you to use the @command{guix import pypi} command; it is of
interest primarily for developers and not for casual users.
+@item
+Installing @uref{http://gnutls.org/, GnuTLS-Guile} will
+allow you to access @code{https} URLs with the @command{guix download}
+command (@pxref{Invoking guix download}) and the @command{guix import
+pypi} command. This is primarily of interest to developers.
+@xref{Guile Preparations, how to install the GnuTLS bindings for Guile,,
+gnutls-guile, GnuTLS-Guile}.
@end itemize
Unless @code{--disable-daemon} was passed to @command{configure}, the