Skip to content

Commit a2d0e4a

Browse files
committed
merge bitcoin#32498: remove Carls substitute server from Guix docs
1 parent 2e0e44a commit a2d0e4a

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

contrib/guix/README.md

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -364,12 +364,6 @@ Where `<PREFIX>` is likely:
364364
- `/usr/local` if you installed Guix from source and didn't supply any
365365
prefix-modifying flags to Guix's `./configure`
366366

367-
For dongcarl's substitute server at https://guix.carldong.io, run as root:
368-
369-
```sh
370-
wget -qO- 'https://guix.carldong.io/signing-key.pub' | guix archive --authorize
371-
```
372-
373367
#### Removing authorized keys
374368

375369
To remove previously authorized keys, simply edit `/etc/guix/acl` and remove the
@@ -381,28 +375,28 @@ Once its key is authorized, the official Guix build farm at
381375
https://ci.guix.gnu.org is automatically used unless the `--no-substitutes` flag
382376
is supplied. This default list of substitute servers is overridable both on a
383377
`guix-daemon` level and when you invoke `guix` commands. See examples below for
384-
the various ways of adding dongcarl's substitute server after having [authorized
385-
his signing key](#step-1-authorize-the-signing-keys).
378+
the various ways of adding a substitute server after having [authorized
379+
its signing key](#step-1-authorize-the-signing-keys).
386380

387381
Change the **default list** of substitute servers by starting `guix-daemon` with
388382
the `--substitute-urls` option (you will likely need to edit your init script):
389383

390384
```sh
391-
guix-daemon <cmd> --substitute-urls='https://guix.carldong.io https://ci.guix.gnu.org'
385+
guix-daemon <cmd> --substitute-urls='https://bordeaux.guix.gnu.org https://ci.guix.gnu.org'
392386
```
393387

394388
Override the default list of substitute servers by passing the
395389
`--substitute-urls` option for invocations of `guix` commands:
396390

397391
```sh
398-
guix <cmd> --substitute-urls='https://guix.carldong.io https://ci.guix.gnu.org'
392+
guix <cmd> --substitute-urls='https://bordeaux.guix.gnu.org https://ci.guix.gnu.org'
399393
```
400394

401395
For scripts under `./contrib/guix`, set the `SUBSTITUTE_URLS` environment
402396
variable:
403397

404398
```sh
405-
export SUBSTITUTE_URLS='https://guix.carldong.io https://ci.guix.gnu.org'
399+
export SUBSTITUTE_URLS='https://bordeaux.guix.gnu.org https://ci.guix.gnu.org'
406400
```
407401

408402
## Option 2: Disabling substitutes on an ad-hoc basis

0 commit comments

Comments
 (0)