aboutsummaryrefslogtreecommitdiff
path: root/gnu/services/base.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-03-17 22:25:03 +0100
committerLudovic Courtès <ludo@gnu.org>2015-03-17 22:25:55 +0100
commit5250a4f215de414f516850e48af2f91c9c17c066 (patch)
tree70276a6b98eb5757ec7bf3ac1d8c1486403ec0e2 /gnu/services/base.scm
parentff40e9b7e55846c86f48c861816ac01bd0d7af7a (diff)
downloadguix-5250a4f215de414f516850e48af2f91c9c17c066.tar
guix-5250a4f215de414f516850e48af2f91c9c17c066.tar.gz
services: guix-service: Remove extraneous monadism.
* gnu/services/base.scm (guix-build-accounts): Remove unneeded 'with-monad'. (guix-service): Adjust accordingly.
Diffstat (limited to 'gnu/services/base.scm')
-rw-r--r--gnu/services/base.scm43
1 files changed, 21 insertions, 22 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 40d4740d46..84bac94d9f 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -568,25 +568,24 @@ given @var{config}---an @code{<nscd-configuration>} object. Optionally,
(shadow shadow))
"Return a list of COUNT user accounts for Guix build users, with UIDs
starting at FIRST-UID, and under GID."
- (with-monad %store-monad
- (return (unfold (cut > <> count)
- (lambda (n)
- (user-account
- (name (format #f "guixbuilder~2,'0d" n))
- (system? #t)
- (uid (+ first-uid n -1))
- (group group)
-
- ;; guix-daemon expects GROUP to be listed as a
- ;; supplementary group too:
- ;; <http://lists.gnu.org/archive/html/bug-guix/2013-01/msg00239.html>.
- (supplementary-groups (list group "kvm"))
-
- (comment (format #f "Guix Build User ~2d" n))
- (home-directory "/var/empty")
- (shell #~(string-append #$shadow "/sbin/nologin"))))
- 1+
- 1))))
+ (unfold (cut > <> count)
+ (lambda (n)
+ (user-account
+ (name (format #f "guixbuilder~2,'0d" n))
+ (system? #t)
+ (uid (+ first-uid n -1))
+ (group group)
+
+ ;; guix-daemon expects GROUP to be listed as a
+ ;; supplementary group too:
+ ;; <http://lists.gnu.org/archive/html/bug-guix/2013-01/msg00239.html>.
+ (supplementary-groups (list group "kvm"))
+
+ (comment (format #f "Guix Build User ~2d" n))
+ (home-directory "/var/empty")
+ (shell #~(string-append #$shadow "/sbin/nologin"))))
+ 1+
+ 1))
(define (hydra-key-authorization guix)
"Return a gexp with code to register the hydra.gnu.org public key with
@@ -636,8 +635,7 @@ passed to @command{guix-daemon}."
(and authorize-hydra-key?
(hydra-key-authorization guix)))
- (mlet %store-monad ((accounts (guix-build-accounts build-accounts
- #:group builder-group)))
+ (with-monad %store-monad
(return (service
(provision '(guix-daemon))
(requirement '(user-processes))
@@ -650,7 +648,8 @@ passed to @command{guix-daemon}."
'("--no-substitutes"))
#$@extra-options)))
(stop #~(make-kill-destructor))
- (user-accounts accounts)
+ (user-accounts (guix-build-accounts build-accounts
+ #:group builder-group))
(user-groups (list (user-group
(name builder-group)
(system? #t)