guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 50203e41812a79cdb2ab97dc43ec91749a69bd59
Author: Hilton Chain <[email protected]>
AuthorDate: Fri Jan 16 23:56:20 2026 +0800
installer: system-services->configuration: Simplify returning sexp.
* gnu/installer/services.scm (system-services->configuration): Simplify
returning sexp to improve readability.
Change-Id: I02a91523bcf4af1b6fe6476ab2f0e390559a8457
---
gnu/installer/services.scm | 58 ++++++++++++++++++----------------------------
1 file changed, 23 insertions(+), 35 deletions(-)
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm
index c3bbf8afdb..833d9ba2ac 100644
--- a/gnu/installer/services.scm
+++ b/gnu/installer/services.scm
@@ -243,44 +243,32 @@
;; under their own account: use 'guix search KEYWORD' to search
;; for packages and 'guix install PACKAGE' to install a package.\n")))))
- (if (null? snippets)
- `(,@(if (null? packages)
- (if (target-hurd?)
- `(,@package-heading
- (packages %base-packages/hurd))
- '())
+ `(,@(if (null? packages)
+ (if (target-hurd?)
`(,@package-heading
- (packages (append (list ,@packages)
- ,(if (target-hurd?)
- '%base-packages/hurd
- '%base-packages)))))
+ (packages %base-packages/hurd))
+ '())
+ `(,@package-heading
+ (packages (append (list ,@packages)
+ ,(if (target-hurd?)
+ '%base-packages/hurd
+ '%base-packages)))))
- ,@service-heading
- (services ,services))
- `(,@(if (null? packages)
- (if (target-hurd?)
- `(,@package-heading
- (packages %base-packages/hurd))
- '())
- `(,@package-heading
- (packages (append (list ,@packages)
- ,(if (target-hurd?)
- '%base-packages/hurd
- '%base-packages)))))
-
- ,@service-heading
- (services (append (list ,@snippets
+ ,@service-heading
+ ,(if (null? snippets)
+ `(services ,services)
+ `(services
+ (append (list ,@snippets
- ,@(if desktop?
- ;; XXX: Assume 'keyboard-layout' is in
- ;; scope.
- `((set-xorg-configuration
- (xorg-configuration
- (keyboard-layout
keyboard-layout))))
- '()))
+ ,@(if desktop?
+ ;; XXX: Assume 'keyboard-layout' is in scope.
+ `((set-xorg-configuration
+ (xorg-configuration
+ (keyboard-layout keyboard-layout))))
+ '()))
- ,(vertical-space 1)
- ,(comment (G_ "\
+ ,(vertical-space 1)
+ ,(comment (G_ "\
;; This is the default list of services we
;; are appending to.\n"))
- ,services))))))
+ ,services))))))
