diff mbox series

[bug#41216] doc: Mention guix-daemon's 'https_proxy' environment variable.

Message ID 20200512200439.16367-1-brice@waegenei.re
State Accepted
Headers show
Series [bug#41216] doc: Mention guix-daemon's 'https_proxy' environment variable. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job

Commit Message

Brice Waegeneire May 12, 2020, 8:04 p.m. UTC 
* doc/guix.texi (Proxy Settings, Derivations): Mention 'https_proxy'.
---
 doc/guix.texi | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

Comments

Mathieu Othacehe May 13, 2020, 6:49 a.m. UTC | #1 
Hello Brice,

> +Substitutes are downloaded over HTTP or HTTPS.  The @env{http_proxy} and
> +@env{https_proxy} environment variables can be set in the environment of
> +@command{guix-daemon} and is honored for downloads of substitutes.  Note

are honored?

This looks fine, thanks!

Mathieu
Brice Waegeneire May 13, 2020, 8:58 a.m. UTC | #2 
Hello Mathieu,

Thank you for the review.

On 2020-05-13 06:49, Mathieu Othacehe wrote:
> Hello Brice,
> 
>> +Substitutes are downloaded over HTTP or HTTPS.  The @env{http_proxy} 
>> and
>> +@env{https_proxy} environment variables can be set in the environment 
>> of
>> +@command{guix-daemon} and is honored for downloads of substitutes.  
>> Note
> 
> are honored?

Fixed.

> This looks fine, thanks!
> 
> Mathieu

Pushed as 15014dc61858e14e3356c7489cd366555085048b.

- Brice
diff mbox series

Patch

diff --git a/doc/guix.texi b/doc/guix.texi
index 420c2c9eae..09d5a1dc52 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -1012,9 +1012,11 @@  environments, which avoids discrepancies in cases where build processes
 capture the name of their build tree.
 
 @vindex http_proxy
-The daemon also honors the @env{http_proxy} environment variable for
-HTTP downloads it performs, be it for fixed-output derivations
-(@pxref{Derivations}) or for substitutes (@pxref{Substitutes}).
+@vindex https_proxy
+The daemon also honors the @env{http_proxy} and @env{https_proxy}
+environment variables for HTTP and HTTPS downloads it performs, be it
+for fixed-output derivations (@pxref{Derivations}) or for substitutes
+(@pxref{Substitutes}).
 
 If you are installing Guix as an unprivileged user, it is still possible
 to run @command{guix-daemon} provided you pass @option{--disable-chroot}.
@@ -3376,13 +3378,13 @@  authenticating bindings between domain names and public keys.)
 @subsection Proxy Settings
 
 @vindex http_proxy
-Substitutes are downloaded over HTTP or HTTPS.
-The @env{http_proxy} environment
-variable can be set in the environment of @command{guix-daemon} and is
-honored for downloads of substitutes.  Note that the value of
-@env{http_proxy} in the environment where @command{guix build},
-@command{guix package}, and other client commands are run has
-@emph{absolutely no effect}.
+@vindex https_proxy
+Substitutes are downloaded over HTTP or HTTPS.  The @env{http_proxy} and
+@env{https_proxy} environment variables can be set in the environment of
+@command{guix-daemon} and is honored for downloads of substitutes.  Note
+that the value of those environment variables in the environment where
+@command{guix build}, @command{guix package}, and other client commands
+are run has @emph{absolutely no effect}.
 
 @node Substitution Failure
 @subsection Substitution Failure