diff options
author | W. J. van der Laan <laanwj@protonmail.com> | 2021-08-02 15:31:20 +0200 |
---|---|---|
committer | W. J. van der Laan <laanwj@protonmail.com> | 2021-08-02 15:38:51 +0200 |
commit | 04222235a47c8c77bbb7db070b151c5a27b7b156 (patch) | |
tree | 1321c5f5241883a5e23ffdf53ccb1fdab801eb53 /contrib/guix/INSTALL.md | |
parent | d7a3c7082d11dcadebb25255abbe5061f2037ed8 (diff) | |
parent | 739d19053b152c8f6a5d70461a9a1b93549f135c (diff) |
Merge bitcoin/bitcoin#22534: [22.x] rc2 backports
739d19053b152c8f6a5d70461a9a1b93549f135c doc: add info to i2p.md about IBD time and multiple networks (Jon Atack)
cc8838ce981a7e6345aa07318d2d857420d6a0de contrib, p2p: update I2P hardcoded seeds (Jon Atack)
cd57bb1a6626e0820ae2456cd3b71c140cf83403 guix: Ensure EPOCH_SOURCE_DATE does not include GPG information (Andrew Chow)
219900a1236ec056d24ccefa97af119d12e14303 guix: Remove extra \r from all.SHA256SUMS line ending (Andrew Chow)
38d18c01e25d3a103697c120a50b366414876370 guix, doc: Add a note that codesigners need to rebuild after tagging (Andrew Chow)
aa9b6aba0302a3c7345f8e6d73a1868083f87874 guix: Allow changing the base manifest in guix-verify (Andrew Chow)
056e47d88748062ef6d4b2f3d3dbf93d9cadca14 guix: Make all.SHA256SUMS rather than codesigned.SHA256SUMS (Andrew Chow)
8f1e3b31b2b4ba024b2adca31a061bbbd2a1378f script, doc: guix touchups (jonatack)
3bbfc1b8e0660a03c7b63eaf2fc8834b499aa811 Updated Readme, Corrected the codesign typo (h)
34f9f88bc95cca04d3a5b71127ea6425a6e3b762 guix/build: Remove vestigial SKIPATTEST.TAG (Carl Dong)
9e52a30ebd0eb29c4068791fbf12d62091ada116 guix/INSTALL: Misc fixups (Carl Dong)
45e0f3d608f707807eadc2e80fc9f2d4f9230a01 guix: Silence getent(1) invocation (Carl Dong)
Pull request description:
Currently backports #22511. We can collect up further backports and merge prior to rc2.
ACKs for top commit:
laanwj:
ACK 739d19053b152c8f6a5d70461a9a1b93549f135c
Tree-SHA512: 8fc795ee56b7757ff405636a2811bd606ea33ba1160f3f1ea42e0e1478ce8211bb60bf7b16a673b932db40a24b76d47c54e703bf2775d3b9385d9b080183b433
Diffstat (limited to 'contrib/guix/INSTALL.md')
-rw-r--r-- | contrib/guix/INSTALL.md | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/contrib/guix/INSTALL.md b/contrib/guix/INSTALL.md index 86f91cc87b..63aa3e02b2 100644 --- a/contrib/guix/INSTALL.md +++ b/contrib/guix/INSTALL.md @@ -79,8 +79,8 @@ Guix v1.2.0 is available as a distribution package starting in [Debian 21.04](https://packages.ubuntu.com/hirsute/guix). Note that if you intend on using Guix without using any substitutes (more -details [here][security-model]), v1.2.0 has a known problems when building -GnuTLS from source. Solutions and workarounds are documented +details [here][security-model]), v1.2.0 has a known problem when building GnuTLS +from source. Solutions and workarounds are documented [here](#gnutls-test-suite-fail-status-request-revoked). @@ -124,7 +124,7 @@ particular commit of Guix). Previous experience with using autotools-style build systems to build packages from source will be helpful. *hic sunt dracones.* I strongly urge you to at least skim through the entire section once before you -start issuing commands, as it will save you a lot of unncessary pain and +start issuing commands, as it will save you a lot of unnecessary pain and anguish. ### Installing common build tools @@ -165,7 +165,7 @@ packaged and installable without manually building and installing. For reference, the graphic below outlines Guix v1.3.0's dependency graph: -![boostrap map](https://user-images.githubusercontent.com/6399679/125064185-a9a59880-e0b0-11eb-82c1-9b8e5dc9950d.png) +![bootstrap map](https://user-images.githubusercontent.com/6399679/125064185-a9a59880-e0b0-11eb-82c1-9b8e5dc9950d.png) #### Guile @@ -270,23 +270,11 @@ Note that these environment variables are used to check for packages during `./configure`, so they should be set as soon as possible should you want to use a prefix other than `/usr`. -<!-- ##### Example: Consistently using Guile 3.0 on Ubuntu --> - -<!-- For example, on Ubuntu, if you choose to use Guile 3.0 and install the --> -<!-- `guile-3.0` package, you want to make sure that if you also want to install the --> -<!-- `guile-git` package with `apt` that said `guile-git` package was built for Guile --> -<!-- v3.0. This can be checked by invoking the following: --> - -<!-- ``` --> -<!-- apt update --> -<!-- apt show guile-git --> -<!-- ``` --> - #### Building and installing source-built packages -***IMPORTANT**: A few dependencies have non-obvious quirks/erratas which are documented in the -sub-sections immediately below. Please read these sections before proceeding to -build and install these packages.* +***IMPORTANT**: A few dependencies have non-obvious quirks/errata which are +documented in the sub-sections immediately below. Please read these sections +before proceeding to build and install these packages.* Although you should always refer to the README or INSTALL files for the most accurate information, most of these dependencies use autoconf-style build |