diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-07-13 16:07:59 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-07-13 18:29:01 +0200 |
| commit | f8a8e0fe1653d4bd998a33f013ea2583b4a32a00 (patch) | |
| tree | a6a322ce08ff58e185e6fe004927ee068b21fee7 /doc | |
| parent | 24f5aaaf24e009de7f7402f2d311a26cafbf4f4a (diff) | |
guix build: Add '--substitute-urls' client option.
* guix/scripts/build.scm (%standard-build-options,
show-build-options-help): Add --substitute-urls=URLS.
(set-build-options-from-command-line): Honor it.
* guix/store.scm (%default-substitute-urls): Make public.
* doc/guix.texi (Substitutes): Add xref to the client --substitute-urls
option.
(Invoking guix build): Document it.
(Invoking guix-daemon): Add 'daemon-substitute-urls' anchor.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/guix.texi | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index 454dde68ff5..7b1d18a151f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi | |||
| @@ -760,6 +760,7 @@ explicitly enable substitution @i{via} the @code{set-build-options} | |||
| 760 | remote procedure call (@pxref{The Store}). | 760 | remote procedure call (@pxref{The Store}). |
| 761 | 761 | ||
| 762 | @item --substitute-urls=@var{urls} | 762 | @item --substitute-urls=@var{urls} |
| 763 | @anchor{daemon-substitute-urls} | ||
| 763 | Consider @var{urls} the default whitespace-separated list of substitute | 764 | Consider @var{urls} the default whitespace-separated list of substitute |
| 764 | source URLs. When this option is omitted, @indicateurl{http://hydra.gnu.org} | 765 | source URLs. When this option is omitted, @indicateurl{http://hydra.gnu.org} |
| 765 | is used. | 766 | is used. |
| @@ -1434,9 +1435,12 @@ also result from derivation builds, can be available as substitutes. | |||
| 1434 | The @code{hydra.gnu.org} server is a front-end to a build farm that | 1435 | The @code{hydra.gnu.org} server is a front-end to a build farm that |
| 1435 | builds packages from the GNU distribution continuously for some | 1436 | builds packages from the GNU distribution continuously for some |
| 1436 | architectures, and makes them available as substitutes. This is the | 1437 | architectures, and makes them available as substitutes. This is the |
| 1437 | default source of substitutes; it can be overridden by passing | 1438 | default source of substitutes; it can be overridden by passing the |
| 1438 | @command{guix-daemon} the @code{--substitute-urls} option | 1439 | @option{--substitute-urls} option either to @command{guix-daemon} |
| 1439 | (@pxref{Invoking guix-daemon}). | 1440 | (@pxref{daemon-substitute-urls,, @code{guix-daemon --substitute-urls}}) |
| 1441 | or to client tools such as @command{guix package} | ||
| 1442 | (@pxref{client-substitute-urls,, client @option{--substitute-urls} | ||
| 1443 | option}). | ||
| 1440 | 1444 | ||
| 1441 | @cindex security | 1445 | @cindex security |
| 1442 | @cindex digital signatures | 1446 | @cindex digital signatures |
| @@ -3584,6 +3588,16 @@ Do not build the derivations. | |||
| 3584 | When substituting a pre-built binary fails, fall back to building | 3588 | When substituting a pre-built binary fails, fall back to building |
| 3585 | packages locally. | 3589 | packages locally. |
| 3586 | 3590 | ||
| 3591 | @item --substitute-urls=@var{urls} | ||
| 3592 | @anchor{client-substitute-urls} | ||
| 3593 | Consider @var{urls} the whitespace-separated list of substitute source | ||
| 3594 | URLs, overriding the default list of URLs of @command{guix-daemon} | ||
| 3595 | (@pxref{daemon-substitute-urls,, @command{guix-daemon} URLs}). | ||
| 3596 | |||
| 3597 | This means that substitutes may be downloaded from @var{urls}, provided | ||
| 3598 | they are signed by a key authorized by the system administrator | ||
| 3599 | (@pxref{Substitutes}). | ||
| 3600 | |||
| 3587 | @item --no-substitutes | 3601 | @item --no-substitutes |
| 3588 | Do not use substitutes for build products. That is, always build things | 3602 | Do not use substitutes for build products. That is, always build things |
| 3589 | locally instead of allowing downloads of pre-built binaries | 3603 | locally instead of allowing downloads of pre-built binaries |
