diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-02-27 12:42:22 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-02-27 12:42:22 +0100 |
commit | 8779987bba029535d3dc00f1aacf59281fdd34f0 (patch) | |
tree | 7a6d616d45367d508f94c3593b1ce5c7053c33f5 /doc/guix.texi | |
parent | 1885bb0c08e943a2e0e37c5c0a83473c8af904d0 (diff) | |
parent | a6d9f8837b118e2126e4b8a19bf48b524229a15c (diff) | |
download | guix-8779987bba029535d3dc00f1aacf59281fdd34f0.tar guix-8779987bba029535d3dc00f1aacf59281fdd34f0.tar.gz |
Merge branch 'master' into python-tests
Diffstat (limited to 'doc/guix.texi')
-rw-r--r-- | doc/guix.texi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 6cdb5e592b..be11096a43 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8611,6 +8611,13 @@ are written. @item @code{lsof} (default: @var{lsof}) The lsof package to use. +@item @code{http-proxy} (default: @code{#f}) +The HTTP proxy used for downloading fixed-output derivations and +substitutes. + +@item @code{tmpdir} (default: @code{#f}) +A directory path where the @command{guix-daemon} will perform builds. + @end table @end deftp |