mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#32498: doc: remove Carls substitute server from Guix docs

Browse Source 
3b824169c7 doc: remove Carls substitute server from Guix docs (fanquake)

Pull request description:

  This no-longer exists. Use one of the other Guix servers in the example.

ACKs for top commit:
  achow101:
    ACK 3b824169c7
  hebasto:
    ACK 3b824169c7, the listed substitute servers are the same as in https://guix.gnu.org/manual/en/html_node/Official-Substitute-Servers.html.

Tree-SHA512: dc3a362ccaa9ce8039d3c02158de9cd71082eb4dd790368bfb11c2942a5aae57e67779b5ff3108b532c4fb765811bd9e145eedb390fc48b52b43d334d5864865
This commit is contained in:
merge-script committed 2025-05-15 09:39:42 +01:00
2 parents 31d3eebfb9 3b824169c7
commit 89c7b6b97a
1 file changed
+5 -11
Download Patch File Download Diff File Expand all files Collapse all files
contrib/guix/README.md
+5 -11
View File
@@ -365,12 +365,6 @@ Where `<PREFIX>` is likely:
- `/usr/local` if you installed Guix from source and didn't supply any - `/usr/local` if you installed Guix from source and didn't supply any
prefix-modifying flags to Guix's `./configure` 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 #### Removing authorized keys
To remove previously authorized keys, simply edit `/etc/guix/acl` and remove the 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 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 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 `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 the various ways of adding a substitute server after having [authorized
his signing key](#step-1-authorize-the-signing-keys). its signing key](#step-1-authorize-the-signing-keys).
Change the **default list** of substitute servers by starting `guix-daemon` with 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): the `--substitute-urls` option (you will likely need to edit your init script):
```sh ```sh
guix-daemon <cmd> --substitute-urls='https://guix.carldong.io https://ci.guix.gnu.org' guix-daemon <cmd> --substitute-urls='https://bordeaux.guix.gnu.org https://ci.guix.gnu.org'
``` ```
Override the default list of substitute servers by passing the Override the default list of substitute servers by passing the
`--substitute-urls` option for invocations of `guix` commands: `--substitute-urls` option for invocations of `guix` commands:
```sh ```sh
guix <cmd> --substitute-urls='https://guix.carldong.io https://ci.guix.gnu.org' guix <cmd> --substitute-urls='https://bordeaux.guix.gnu.org https://ci.guix.gnu.org'
``` ```
For scripts under `./contrib/guix`, set the `SUBSTITUTE_URLS` environment For scripts under `./contrib/guix`, set the `SUBSTITUTE_URLS` environment
variable: variable:
```sh ```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 ## Option 2: Disabling substitutes on an ad-hoc basis