diff options
| author | Andrew Tropin <andrew@trop.in> | 2024-06-02 15:05:59 +0400 |
|---|---|---|
| committer | Andrew Tropin <andrew@trop.in> | 2024-06-02 15:06:16 +0400 |
| commit | eac5171246da875f5996621c5329c833fd85b891 (patch) | |
| tree | ed1828c72e5cae96d15acc64f2030e3a8f6f4a8b | |
| parent | d82e36591e4bbedb20131cba702ad677f39de954 (diff) | |
| download | guix-patches-base-for-issue-70829.tar guix-patches-base-for-issue-70829.tar.gz | |
Revert "services: home: Use pairs instead of lists."base-for-issue-71344base-for-issue-71342base-for-issue-71341base-for-issue-71340base-for-issue-71339base-for-issue-71329base-for-issue-71328base-for-issue-71327base-for-issue-71219base-for-issue-71001base-for-issue-70829base-for-issue-70323
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
| -rw-r--r-- | doc/guix.texi | 4 | ||||
| -rw-r--r-- | gnu/services/guix.scm | 6 | ||||
| -rw-r--r-- | gnu/tests/guix.scm | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/doc/guix.texi b/doc/guix.texi index ea8ac24443..1224104038 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -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 diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index 3818749baa..96f5ecaac0 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -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 diff --git a/gnu/tests/guix.scm b/gnu/tests/guix.scm index 6071cb018e..12ad1bf255 100644 --- a/gnu/tests/guix.scm +++ b/gnu/tests/guix.scm @@ -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 |