Ava Chow
93e8bcc077
Merge bitcoin/bitcoin#32442 : doc: guix: Troubleshooting zdiff3 issue and uninstalling.
...
e76e886581 guix: doc: zdiff3 doesn't work (David Gumberg)
ea1be38677 guix: doc: Suggest guix-install.sh --uninstall (David Gumberg)
Pull request description:
Add a note about guix issues with git `merge.conflictstyle` being set to `zdiff3`, and add information about how to uninstall for users of `guix-install.sh`
ACKs for top commit:
achow101:
ACK e76e886581
hebasto:
ACK e76e886581 .
sedited:
utACK e76e886581
Tree-SHA512: e9edc49851579c52e7ac762221d0bb51c928da4dff5566ece766af7f7eb75466831a76f885ccc5a26207c84b846e3f42bae26e80ddece3df1611de2c2320c28a
2026-03-19 16:32:53 -07:00
MarcoFalke
faa70ca764
doc: Update Guix install for Debian/Ubuntu
...
Fixes https://github.com/bitcoin/bitcoin/issues/33982
Co-authored-by: Purple Ninja <129023353+ToRyVand@users.noreply.github.com >
2026-02-25 19:49:35 +01:00
David Gumberg
e76e886581
guix: doc: zdiff3 doesn't work
2025-12-12 02:36:17 -08:00
David Gumberg
ea1be38677
guix: doc: Suggest guix-install.sh --uninstall
2025-12-12 02:36:17 -08:00
fanquake
b4d0288c46
doc: update Guix INSTALL.md
2025-10-30 15:49:04 +00:00
fanquake
c8d9baae94
guix: accomodate migration to codeberg
...
See https://guix.gnu.org/blog/2025/migrating-to-codeberg/ .
When interacting with the old repo you may now also see:
```bash
warning: redirecting to https://codeberg.org/guix/guix/
```
2025-05-27 11:34:03 +01:00
fanquake
1372eb09c5
doc: swap "Docker image" for "container image"
...
I haven't used Docker for some time (now Podman), and the images are
generic, so just use container image. I'll be pushing some changes to
https://github.com/fanquake/core-review/tree/master/guix , to reflect this.
2025-05-08 10:20:21 +01:00
wgyt
5601bab4f8
Docs: fix typos in documentation files
2025-03-08 09:26:18 +08:00
Sjors Provoost
8fee5355ee
guix: fix suggested fake date for openssl -1.1.1l
...
Also fix layout of instructions.
2024-04-29 20:44:37 +02:00
MarcoFalke
fad444f6e1
doc: Rework guix docs after 1.4 release
2023-12-18 10:31:11 +01:00
MarcoFalke
fa552e8a4e
doc: Simplify guix install doc, after 1.4 release
2023-11-17 12:45:00 +01:00
fanquake
8f541023b9
doc: s/--no-substitute/--no-substitutes in guix/INSTALL
2023-09-07 09:51:12 +01:00
Sjors Provoost
10660c0c60
doc: move Guix uninstall instructions to INSTALL.md
...
Also drop unused links.
2022-11-03 14:20:44 +01:00
Sjors Provoost
68fab72a8c
guix: OpenSSL test failure workaround
...
Co-Authored-By: Stephan Oeste <emzy@emzy.de >
2022-11-03 12:52:13 +01:00
Sjors Provoost
d612dca852
guix: reminder to migrate guix-daemon-original customization
2022-11-03 12:52:12 +01:00
Sjors Provoost
8aa460cd02
guix: add guile-gnutls and guile-json to install list
...
They are mentioned in the figure above, but having them in the table makes it easier to (apt) install everything required.
2022-11-03 12:52:12 +01:00
Sjors Provoost
9b9991e026
guix: recommend mounting a tmpfs on /tmp
...
This was already suggested in the troubleshooting section, but recommending it upfront would prevent the issue in the first place and speed up builds.
2022-11-03 12:52:12 +01:00
Sjors Provoost
682283445e
guix: bump recommended hash for manual installation
...
Tracks time-machine bump in 298389e3b5 .
2022-10-21 09:50:19 +02:00
Stacie
98383d6d0d
doc: minor updates to guix README
2022-08-15 16:03:17 -04:00
Jeremy Rand
9bdda50151
Enable TLS in links in documentation
2021-09-16 22:00:20 +00:00
Carl Dong
a884a1edcd
guix/INSTALL: Misc fixups
2021-07-22 17:42:46 -04:00
Carl Dong
5d24cc3d82
guix/INSTALL: Guix installs init scripts in libdir
2021-07-19 18:24:36 -04:00
Carl Dong
5da2ee49d5
guix/INSTALL: Add coreutils/inotify-dir-recreate troubleshooting
2021-07-19 18:24:36 -04:00
Carl Dong
c2541fd0ca
guix: Overhaul README
...
- Added detailed Guix bootstrap/installation instructions
2021-07-19 18:24:36 -04:00