me
/
guix
Archived
1
0
Fork 0
Code

services: Remove unnecessary references to (gnu build shepherd). 

* gnu/services/databases.scm (memcached-shepherd-service): Remove
‘with-imported-modules’ form and ‘modules’ field.
* gnu/services/security-token.scm (pcscd-shepherd-service): Remove
‘with-imported-modules’ form.
* gnu/services/web.scm (hpcguix-web-shepherd-service): Likewise.

Change-Id: Ieb817508f1751e0c1ff551a0e078789a4a813c1c
Ludovic Courtès 2023-11-14 11:48:50 +01:00
parent 62a08abea7
commit 3d6583727e
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 55 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/services/databases.scm
View File

@ -512,13 +512,10 @@ created after the PostgreSQL database is started.")))
(match-lambda (match-lambda
(($ <memcached-configuration> memcached interfaces tcp-port udp-port (($ <memcached-configuration> memcached interfaces tcp-port udp-port
additional-options) additional-options)
(with-imported-modules (source-module-closure
'((gnu build shepherd)))
(list (shepherd-service (list (shepherd-service
(provision '(memcached)) (provision '(memcached))
(documentation "Run the Memcached daemon.") (documentation "Run the Memcached daemon.")
(requirement '(user-processes loopback)) (requirement '(user-processes loopback))
(modules '((gnu build shepherd)))
(start #~(make-forkexec-constructor (start #~(make-forkexec-constructor
`(#$(file-append memcached "/bin/memcached") `(#$(file-append memcached "/bin/memcached")
"-l" #$(string-join interfaces ",") "-l" #$(string-join interfaces ",")
@ -533,7 +530,7 @@ created after the PostgreSQL database is started.")))
,#$@additional-options) ,#$@additional-options)
#:log-file "/var/log/memcached" #:log-file "/var/log/memcached"
#:pid-file "/var/run/memcached/pid")) #:pid-file "/var/run/memcached/pid"))
(stop #~(make-kill-destructor)))))))) (stop #~(make-kill-destructor)))))))
(define memcached-service-type (define memcached-service-type
(service-type (name 'memcached) (service-type (name 'memcached)

5
gnu/services/security-token.scm
View File

@ -50,13 +50,10 @@
(define pcscd-shepherd-service (define pcscd-shepherd-service
(match-lambda (match-lambda
(($ <pcscd-configuration> pcsc-lite) (($ <pcscd-configuration> pcsc-lite)
(with-imported-modules (source-module-closure
'((gnu build shepherd)))
(shepherd-service (shepherd-service
(documentation "PC/SC Smart Card Daemon") (documentation "PC/SC Smart Card Daemon")
(provision '(pcscd)) (provision '(pcscd))
(requirement '(syslogd)) (requirement '(syslogd))
(modules '((gnu build shepherd)))
(start #~(lambda _ (start #~(lambda _
(let ((socket "/run/pcscd/pcscd.comm")) (let ((socket "/run/pcscd/pcscd.comm"))
(when (file-exists? socket) (when (file-exists? socket)
@ -65,7 +62,7 @@
(list #$(file-append pcsc-lite "/sbin/pcscd") (list #$(file-append pcsc-lite "/sbin/pcscd")
"--foreground") "--foreground")
#:log-file "/var/log/pcscd.log"))) #:log-file "/var/log/pcscd.log")))
(stop #~(make-kill-destructor))))))) (stop #~(make-kill-destructor))))))
(define pcscd-activation (define pcscd-activation
(match-lambda (match-lambda

4
gnu/services/web.scm
View File

@ -1232,8 +1232,6 @@ a webserver.")
(let* ((specs (hpcguix-web-configuration-specs config)) (let* ((specs (hpcguix-web-configuration-specs config))
(config-file (and specs (scheme-file "hpcguix-web.scm" specs))) (config-file (and specs (scheme-file "hpcguix-web.scm" specs)))
(hpcguix-web (hpcguix-web-package config))) (hpcguix-web (hpcguix-web-package config)))
(with-imported-modules (source-module-closure
'((gnu build shepherd)))
(shepherd-service (shepherd-service
(documentation "hpcguix-web daemon") (documentation "hpcguix-web daemon")
(provision '(hpcguix-web)) (provision '(hpcguix-web))
@ -1256,7 +1254,7 @@ a webserver.")
"SSL_CERT_DIR=/etc/ssl/certs") "SSL_CERT_DIR=/etc/ssl/certs")
#:log-file #$%hpcguix-web-log-file)) #:log-file #$%hpcguix-web-log-file))
(stop #~(make-kill-destructor)) (stop #~(make-kill-destructor))
(actions (list (shepherd-configuration-action config-file))))))) (actions (list (shepherd-configuration-action config-file))))))
(define hpcguix-web-service-type (define hpcguix-web-service-type
(service-type (service-type