aboutsummaryrefslogtreecommitdiff
path: root/build-aux/pre-inst-env.in
diff options
context:
space:
mode:
authorAndrew Tropin <andrew@trop.in>2024-05-22 13:49:37 +0400
committerAndrew Tropin <andrew@trop.in>2024-06-02 13:38:52 +0400
commitdbeef44f3c520816251bde74c1005915a637e1ef (patch)
tree1acade4b0055a56491859f9221c5c8f0746b68f5 /build-aux/pre-inst-env.in
parentfa7906d64881ee12e0c418136b44c73766e3d169 (diff)
downloadguix-dbeef44f3c520816251bde74c1005915a637e1ef.tar.gz
guix-dbeef44f3c520816251bde74c1005915a637e1ef.zip
services: home: Use pairs instead of lists.
* gnu/services/guix.scm: Use pairs instead of lists. * doc/guix.texi: Update accordingly. * gnu/tests/guix.scm: Update accordingly. Change-Id: I0b8d3fa5b214add89bdb84a11fa20d1b319435f0
Diffstat (limited to 'build-aux/pre-inst-env.in')
0 files changed, 0 insertions, 0 deletions
generated by cgit
d class='rem' style='width: 29.4%;'/>
1 files changed, 12 insertions, 5 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index a3646b1d54..a7b7c246bf 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -357,11 +357,17 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
;; network. It can be faster than fetching from remote servers.
(service avahi-service-type)
- ;; The build daemon. Register the default substitute server key(s)
- ;; as trusted to allow the installation process to use substitutes by
- ;; default.
+ ;; The build daemon.
(service guix-service-type
- (guix-configuration (authorize-key? #t)))
+ (guix-configuration
+ ;; Register the default substitute server key(s) as
+ ;; trusted to allow the installation process to use
+ ;; substitutes by default.
+ (authorize-key? #t)
+
+ ;; Install and run the current Guix rather than an older
+ ;; snapshot.
+ (guix (current-guix))))
;; Start udev so that useful device nodes are available.
;; Use device-mapper rules for cryptsetup & co; enable the CRDA for
@@ -463,7 +469,8 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m
(bootloader grub-bootloader)
(targets '("/dev/sda"))))
(label (string-append "GNU Guix installation "
- (package-version guix)))
+ (or (getenv "GUIX_DISPLAYED_VERSION")
+ (package-version guix))))
;; XXX: The AMD Radeon driver is reportedly broken, which makes kmscon
;; non-functional:
generated by cgit