Skip to content

Commit 88c8363

Browse files
committed
guix: Update documentation for time-machine
Wait a minute, doc. Are you telling me you built a time machine... Out of a functional package manager?
1 parent e605088 commit 88c8363

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

contrib/guix/README.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,16 @@ Likewise, to perform a bootstrapped build (takes even longer):
6262
export ADDITIONAL_GUIX_ENVIRONMENT_FLAGS='--bootstrap --no-substitutes'
6363
```
6464

65-
### Using the right Guix
65+
### Using a version of Guix with `guix time-machine` capabilities
6666

67-
Once Guix is installed, deploy our patched version into your current Guix
68-
profile. The changes there are slowly being upstreamed.
67+
> Note: This entire section can be skipped if you are already using a version of
68+
> Guix that has [the `guix time-machine` command][guix/time-machine].
69+
70+
Once Guix is installed, if it doesn't have the `guix time-machine` command, pull
71+
the latest `guix`.
6972

7073
```sh
71-
guix pull --url=https://github.com/dongcarl/guix.git \
72-
--commit=82c77e52b8b46e0a3aad2cb12307c2e30547deec \
73-
--max-jobs=4 # change accordingly
74+
guix pull --max-jobs=4 # change number of jobs accordingly
7475
```
7576

7677
Make sure that you are using your current profile. (You are prompted to do this
@@ -80,9 +81,6 @@ at the end of the `guix pull`)
8081
export PATH="${HOME}/.config/guix/current/bin${PATH:+:}$PATH"
8182
```
8283

83-
> Note: There is ongoing work to eliminate this entire section using Guix
84-
> [inferiors][guix/inferiors] and [channels][guix/channels].
85-
8684
## Usage
8785

8886
### As a Development Environment
@@ -224,6 +222,7 @@ repository and will likely put one up soon.
224222
[guix/substitute-server-auth]: https://www.gnu.org/software/guix/manual/en/html_node/Substitute-Server-Authorization.html
225223
[guix/inferiors]: https://www.gnu.org/software/guix/manual/en/html_node/Inferiors.html
226224
[guix/channels]: https://www.gnu.org/software/guix/manual/en/html_node/Channels.html
225+
[guix/time-machine]: https://guix.gnu.org/manual/en/html_node/Invoking-guix-time_002dmachine.html
227226

228227
[debian/guix-package]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=850644
229228
[fanquake/guix-docker]: https://github.com/fanquake/core-review/tree/master/guix

0 commit comments

Comments
 (0)