Skip to content

Commit be92dc5

Browse files
committed
Merge bitcoin/bitcoin#22538: doc: fix command typo in guix README
198ceb8 script, doc: guix touchups (jonatack) d7b7f61 Updated Readme, Corrected the codesign typo (h) Pull request description: ACKs for top commit: jamesob: ACK bitcoin/bitcoin@198ceb8 jonatack: ACK 198ceb8 Tree-SHA512: 408360cebb51cff330fdd5d5d8ae91a168cdc99fb1377913fd9119e6eba536e58f87ff5c5b479e21a21fa3403323b137c338005bbd67e6fd24314929cdff9325
2 parents 4b1fb50 + 198ceb8 commit be92dc5

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

contrib/guix/README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ We achieve bootstrappability by using Guix as a functional package manager.
1111

1212
# Requirements
1313

14-
Conservatively, a x86_64 machine with:
14+
Conservatively, you will need an x86_64 machine with:
1515

1616
- 16GB of free disk space on the partition that /gnu/store will reside in
1717
- 8GB of free disk space **per platform triple** you're planning on building
@@ -87,7 +87,7 @@ crucial differences:
8787
An invocation with all default options would look like:
8888

8989
```
90-
env DETACHED_SIGS_REPO=<path/to/bitcoin-detached-sigs> ./contrib/guix-codesign
90+
env DETACHED_SIGS_REPO=<path/to/bitcoin-detached-sigs> ./contrib/guix/guix-codesign
9191
```
9292

9393
## Cleaning intermediate work directories
@@ -437,9 +437,8 @@ In the extraordinarily rare case where you messed up your Guix installation in
437437
an irreversible way, you may want to completely purge Guix from your system and
438438
start over.
439439

440-
1. Uninstall Guix itself according to the way you installed it. (e.g. `sudo apt
441-
purge guix` for Ubuntu packaging, `sudo make uninstall` for
442-
built-from-source).
440+
1. Uninstall Guix itself according to the way you installed it (e.g. `sudo apt
441+
purge guix` for Ubuntu packaging, `sudo make uninstall` for a build from source).
443442
2. Remove all build users and groups
444443

445444
You may check for relevant users and groups using:

doc/build-openbsd.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export AUTOMAKE_VERSION=1.16
6868
Make sure `BDB_PREFIX` is set to the appropriate path from the above steps.
6969

7070
Note that building with external signer support currently fails on OpenBSD,
71-
hence you have to explicitely disable it by passing the parameter
71+
hence you have to explicitly disable it by passing the parameter
7272
`--disable-external-signer` to the configure script.
7373
(Background: the feature requires the header-only library boost::process, which
7474
is available on OpenBSD 6.9 via Boost 1.72.0, but contains certain system calls

0 commit comments

Comments
 (0)