Skip to content

Commit 0f90b58

Browse files
author
MacroFake
committed
Merge bitcoin/bitcoin#25833: doc: minor updates to guix README
98383d6 doc: minor updates to guix README (Stacie) Pull request description: Two minor updates to the guix docs: - `contrib/guix/README.md`: fix broken link - `contrib/guix/INSTALL.md`: Change Ubuntu version in the section on distribution maintained packages from 21.04 (Hirsute Hippo) to 22.04 (Jammy Jellyfish). The previous link to the Ubuntu Guix package (https://packages.ubuntu.com/hirsute/guix) was for Hirsute. That link is now broken, likely because Hirsute reached EOL in January. I was unable to locate a general page for Ubuntu Guix packages so I replaced the broken link with the search results for all Ubuntu Guix packages. That page currently displays Guix packages for three different versions of Ubuntu. Happy to replace this link if there is a better option. ACKs for top commit: jarolrod: ACK 98383d6 Tree-SHA512: 6980f5952862773e79ca317edb4aadf6ff7c71726a0e4cb873c08bf51360c64e0498aabf4f53780f13cb06838eda93c89ba10fe35c4c8ae2b23191ab961b98f8
2 parents 22d96d7 + 98383d6 commit 0f90b58

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

contrib/guix/INSTALL.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ writing (July 2021). Guix is expected to be more widely packaged over time. For
7272
an up-to-date view on Guix's package status/version across distros, please see:
7373
https://repology.org/project/guix/versions
7474

75-
### Debian 11 (Bullseye)/Ubuntu 21.04 (Hirsute Hippo)
75+
### Debian / Ubuntu
7676

7777
Guix v1.2.0 is available as a distribution package starting in [Debian
7878
11](https://packages.debian.org/bullseye/guix) and [Ubuntu
79-
21.04](https://packages.ubuntu.com/hirsute/guix).
79+
21.04](https://packages.ubuntu.com/search?keywords=guix).
8080

8181
Note that if you intend on using Guix without using any substitutes (more
8282
details [here][security-model]), v1.2.0 has a known problem when building GnuTLS

contrib/guix/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ https://ci.guix.gnu.org is automatically used unless the `--no-substitutes` flag
382382
is supplied. This default list of substitute servers is overridable both on a
383383
`guix-daemon` level and when you invoke `guix` commands. See examples below for
384384
the various ways of adding dongcarl's substitute server after having [authorized
385-
his signing key](#authorize-the-signing-keys).
385+
his signing key](#step-1-authorize-the-signing-keys).
386386

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

0 commit comments

Comments
 (0)