nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

services: guix-service: Remove extraneous monadism. 

* gnu/services/base.scm (guix-build-accounts): Remove unneeded
  'with-monad'.
  (guix-service): Adjust accordingly.
This commit is contained in:
Ludovic Courtès 2015-03-17 22:25:03 +01:00
parent ff40e9b7e5
commit 5250a4f215
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gnu/services/base.scm
View File

@ -568,25 +568,24 @@ given @var{config}---an @code{<nscd-configuration>} object. Optionally,
(shadow shadow)) (shadow shadow))
"Return a list of COUNT user accounts for Guix build users, with UIDs "Return a list of COUNT user accounts for Guix build users, with UIDs
starting at FIRST-UID, and under GID." starting at FIRST-UID, and under GID."
(with-monad %store-monad (unfold (cut > <> count)
(return (unfold (cut > <> count) (lambda (n)
(lambda (n) (user-account
(user-account (name (format #f "guixbuilder~2,'0d" n))
(name (format #f "guixbuilder~2,'0d" n)) (system? #t)
(system? #t) (uid (+ first-uid n -1))
(uid (+ first-uid n -1)) (group group)
(group group)
;; guix-daemon expects GROUP to be listed as a ;; guix-daemon expects GROUP to be listed as a
;; supplementary group too: ;; supplementary group too:
;; <http://lists.gnu.org/archive/html/bug-guix/2013-01/msg00239.html>. ;; <http://lists.gnu.org/archive/html/bug-guix/2013-01/msg00239.html>.
(supplementary-groups (list group "kvm")) (supplementary-groups (list group "kvm"))
(comment (format #f "Guix Build User ~2d" n)) (comment (format #f "Guix Build User ~2d" n))
(home-directory "/var/empty") (home-directory "/var/empty")
(shell #~(string-append #$shadow "/sbin/nologin")))) (shell #~(string-append #$shadow "/sbin/nologin"))))
1+ 1+
1)))) 1))
(define (hydra-key-authorization guix) (define (hydra-key-authorization guix)
"Return a gexp with code to register the hydra.gnu.org public key with "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? (and authorize-hydra-key?
(hydra-key-authorization guix))) (hydra-key-authorization guix)))
(mlet %store-monad ((accounts (guix-build-accounts build-accounts (with-monad %store-monad
#:group builder-group)))
(return (service (return (service
(provision '(guix-daemon)) (provision '(guix-daemon))
(requirement '(user-processes)) (requirement '(user-processes))
@ -650,7 +648,8 @@ passed to @command{guix-daemon}."
'("--no-substitutes")) '("--no-substitutes"))
#$@extra-options))) #$@extra-options)))
(stop #~(make-kill-destructor)) (stop #~(make-kill-destructor))
(user-accounts accounts) (user-accounts (guix-build-accounts build-accounts
#:group builder-group))
(user-groups (list (user-group (user-groups (list (user-group
(name builder-group) (name builder-group)
(system? #t) (system? #t)