diff --git a/contrib/guix/README.md b/contrib/guix/README.md index f0ba490366a..7f6b8232bba 100644 --- a/contrib/guix/README.md +++ b/contrib/guix/README.md @@ -365,12 +365,6 @@ Where `` is likely: - `/usr/local` if you installed Guix from source and didn't supply any prefix-modifying flags to Guix's `./configure` -For dongcarl's substitute server at https://guix.carldong.io, run as root: - -```sh -wget -qO- 'https://guix.carldong.io/signing-key.pub' | guix archive --authorize -``` - #### Removing authorized keys To remove previously authorized keys, simply edit `/etc/guix/acl` and remove the @@ -382,28 +376,28 @@ Once its key is authorized, the official Guix build farm at https://ci.guix.gnu.org is automatically used unless the `--no-substitutes` flag is supplied. This default list of substitute servers is overridable both on a `guix-daemon` level and when you invoke `guix` commands. See examples below for -the various ways of adding dongcarl's substitute server after having [authorized -his signing key](#step-1-authorize-the-signing-keys). +the various ways of adding a substitute server after having [authorized +its signing key](#step-1-authorize-the-signing-keys). Change the **default list** of substitute servers by starting `guix-daemon` with the `--substitute-urls` option (you will likely need to edit your init script): ```sh -guix-daemon --substitute-urls='https://guix.carldong.io https://ci.guix.gnu.org' +guix-daemon --substitute-urls='https://bordeaux.guix.gnu.org https://ci.guix.gnu.org' ``` Override the default list of substitute servers by passing the `--substitute-urls` option for invocations of `guix` commands: ```sh -guix --substitute-urls='https://guix.carldong.io https://ci.guix.gnu.org' +guix --substitute-urls='https://bordeaux.guix.gnu.org https://ci.guix.gnu.org' ``` For scripts under `./contrib/guix`, set the `SUBSTITUTE_URLS` environment variable: ```sh -export SUBSTITUTE_URLS='https://guix.carldong.io https://ci.guix.gnu.org' +export SUBSTITUTE_URLS='https://bordeaux.guix.gnu.org https://ci.guix.gnu.org' ``` ## Option 2: Disabling substitutes on an ad-hoc basis