~ruther/guix-local

eac5171246da875f5996621c5329c833fd85b891 — Andrew Tropin 1 year, 8 months ago d82e365
Revert "services: home: Use pairs instead of lists."

This reverts commit dbeef44f3c520816251bde74c1005915a637e1ef.

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
3 files changed, 5 insertions(+), 7 deletions(-)

M doc/guix.texi
M gnu/services/guix.scm
M gnu/tests/guix.scm
M doc/guix.texi => doc/guix.texi +2 -2
@@ 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


M gnu/services/guix.scm => gnu/services/guix.scm +2 -4
@@ 696,7 696,7 @@ ca-certificates.crt file in the system profile."

(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 @@ ca-certificates.crt file in the system profile."
                     (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

M gnu/tests/guix.scm => gnu/tests/guix.scm +1 -1
@@ 271,7 271,7 @@ host	all	all	::1/128 	trust"))))))
(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