me
/
guix
Archived
1
0
Fork 0
Code

Revert "services: home: Use pairs instead of lists." 

This reverts commit dbeef44f3c.

Despite the more semantically correct data type, it doesn't follow the style
of the most services and also breaks user-facing API.

Change-Id: Ib4ef4e9cd2f53ac853a5b7c7c90e57c35c99a5ea
master
Andrew Tropin 2024-06-02 15:05:59 +04:00
parent d82e36591e
commit eac5171246
No known key found for this signature in database
GPG Key ID: 2208D20958C1DEB0
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guix.texi
View File

@ -39607,7 +39607,7 @@ the value is a home-environment configuration.
(operating-system (operating-system
(services (append (list (service guix-home-service-type (services (append (list (service guix-home-service-type
`(("alice" . ,my-home)))) `(("alice" ,my-home))))
%base-services))) %base-services)))
@end lisp @end lisp
@ -39616,7 +39616,7 @@ environments, as in this example:
@lisp @lisp
(simple-service 'my-extra-home home-service-type (simple-service 'my-extra-home home-service-type
`(("bob" . ,my-extra-home)))) `(("bob" ,my-extra-home))))
@end lisp @end lisp
@end defvar @end defvar

6
gnu/services/guix.scm
View File

@ -696,7 +696,7 @@ ca-certificates.crt file in the system profile."
(define (guix-home-shepherd-service config) (define (guix-home-shepherd-service config)
(map (match-lambda (map (match-lambda
(((? string? user) . (? home-environment? he)) ((user he)
(shepherd-service (shepherd-service
(documentation "Activate Guix Home.") (documentation "Activate Guix Home.")
(requirement '(user-processes)) (requirement '(user-processes))
@ -710,9 +710,7 @@ ca-certificates.crt file in the system profile."
(list (string-append "HOME=" (passwd:dir (getpw #$user))) (list (string-append "HOME=" (passwd:dir (getpw #$user)))
"GUIX_SYSTEM_IS_RUNNING_HOME_ACTIVATE=t") "GUIX_SYSTEM_IS_RUNNING_HOME_ACTIVATE=t")
#:group (group:name (getgrgid (passwd:gid (getpw #$user)))))) #:group (group:name (getgrgid (passwd:gid (getpw #$user))))))
(stop #~(make-kill-destructor)))) (stop #~(make-kill-destructor)))))
(e (error "Invalid value for guix-home, it should be in a form of
(\"user-name\" . home-environment), but the following value is provided:\n" e)))
config)) config))
(define guix-home-service-type (define guix-home-service-type

2
gnu/tests/guix.scm
View File

@ -271,7 +271,7 @@ host all all ::1/128 trust"))))))
(define %guix-home-service-os (define %guix-home-service-os
(simple-operating-system (simple-operating-system
(service guix-home-service-type (service guix-home-service-type
`(("alice" . ,%guix-home-service-he))))) `(("alice" ,%guix-home-service-he)))))
(define (run-guix-home-service-test) (define (run-guix-home-service-test)
(define os (define os