ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
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
(services (append (list (service guix-home-service-type
`(("alice" . ,my-home))))
`(("alice" ,my-home))))
%base-services)))
@end lisp
@ -39616,7 +39616,7 @@ environments, as in this example:
@lisp
(simple-service 'my-extra-home home-service-type
`(("bob" . ,my-extra-home))))
`(("bob" ,my-extra-home))))
@end lisp
@end defvar

6
gnu/services/guix.scm
View file

@ -696,7 +696,7 @@ (define guix-data-service-type
(define (guix-home-shepherd-service config)
(map (match-lambda
(((? string? user) . (? home-environment? he))
((user he)
(shepherd-service
(documentation "Activate Guix Home.")
(requirement '(user-processes))
@ -710,9 +710,7 @@ (define (guix-home-shepherd-service config)
(list (string-append "HOME=" (passwd:dir (getpw #$user)))
"GUIX_SYSTEM_IS_RUNNING_HOME_ACTIVATE=t")
#:group (group:name (getgrgid (passwd:gid (getpw #$user))))))
(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)))
(stop #~(make-kill-destructor)))))
config))
(define guix-home-service-type

2
gnu/tests/guix.scm
View file

@ -271,7 +271,7 @@ (define %guix-home-service-he
(define %guix-home-service-os
(simple-operating-system
(service guix-home-service-type
`(("alice" . ,%guix-home-service-he)))))
`(("alice" ,%guix-home-service-he)))))
(define (run-guix-home-service-test)
(define os