From 892f1b7273d57b25940700877a02618fe826cc08 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 18 Nov 2021 22:44:26 +0100 Subject: services: Accept s in lieu of s. * gnu/services/authentication.scm (fprintd-configuration) (nslcd-configuration): Substitute file-like objects for package ones. * gnu/services/cgit.scm (cgit-configuration, opaque-cgit-configuration): Likewise. * gnu/services/cups.scm (package-list?, cups-configuration): Likewise. * gnu/services/dns.scm (verify-knot-configuration) (ddclient-configuration): Likewise. * gnu/services/docker.scm (docker-configuration): Likewise. * gnu/services/file-sharing.scm (transmission-daemon-configuration): Likewise. * gnu/services/getmail.scm (getmail-configuration): Likewise. * gnu/services/mail.scm (dovecot-configuration) (opaque-dovecot-configuration): Likewise. * gnu/services/messaging.scm (prosody-configuration) (opaque-prosody-configuration): Likewise. * gnu/services/monitoring.scm (zabbix-server-configuration) (zabbix-agent-configuration): Likewise. * gnu/services/networking.scm (opendht-configuration): Likewise. * gnu/services/pm.scm (tlp-configuration): Likewise. * gnu/services/telephony.scm (jami-configuration): Likewise. * gnu/services/virtualization.scm (libvirt-configuration) (qemu-guest-agent-configuration): Likewise. * gnu/services/vpn.scm (openvpn-client-configuration): Likewise. --- gnu/services/base.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu/services/base.scm') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index ba01f5d764..2631478b9e 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -560,7 +560,7 @@ (define urandom-seed-service-type (define-record-type* rngd-configuration make-rngd-configuration rngd-configuration? - (rng-tools rngd-configuration-rng-tools) ;package + (rng-tools rngd-configuration-rng-tools) ;file-like (device rngd-configuration-device)) ;string (define rngd-service-type @@ -775,7 +775,7 @@ (define* (login-service #:optional (config (login-configuration))) (define-record-type* agetty-configuration make-agetty-configuration agetty-configuration? - (agetty agetty-configuration-agetty ; + (agetty agetty-configuration-agetty ;file-like (default util-linux)) (tty agetty-configuration-tty) ;string | #f (term agetty-term ;string | #f @@ -1043,7 +1043,7 @@ (define* (agetty-service config) (define-record-type* mingetty-configuration make-mingetty-configuration mingetty-configuration? - (mingetty mingetty-configuration-mingetty ; + (mingetty mingetty-configuration-mingetty ;file-like (default mingetty)) (tty mingetty-configuration-tty) ;string (auto-login mingetty-auto-login ;string | #f @@ -1115,9 +1115,9 @@ (define-record-type* nscd-configuration ;; TODO: See nscd.conf in glibc for other options to add. (caches nscd-configuration-caches ;list of (default %nscd-default-caches)) - (name-services nscd-configuration-name-services ;list of + (name-services nscd-configuration-name-services ;list of file-like (default '())) - (glibc nscd-configuration-glibc ; + (glibc nscd-configuration-glibc ;file-like (default glibc))) (define-record-type* nscd-cache make-nscd-cache @@ -1516,7 +1516,7 @@ (define %default-authorized-guix-keys (define-record-type* guix-configuration make-guix-configuration guix-configuration? - (guix guix-configuration-guix ; + (guix guix-configuration-guix ;file-like (default guix)) (build-group guix-configuration-build-group ;string (default "guixbuild")) @@ -1769,7 +1769,7 @@ (define guix-service-type (define-record-type* guix-publish-configuration make-guix-publish-configuration guix-publish-configuration? - (guix guix-publish-configuration-guix ;package + (guix guix-publish-configuration-guix ;file-like (default guix)) (port guix-publish-configuration-port ;number (default 80)) @@ -1924,9 +1924,9 @@ (define guix-publish-service-type (define-record-type* udev-configuration make-udev-configuration udev-configuration? - (udev udev-configuration-udev ; + (udev udev-configuration-udev ;file-like (default eudev)) - (rules udev-configuration-rules ;list of + (rules udev-configuration-rules ;list of file-like (default '()))) (define (udev-rules-union packages) @@ -2248,7 +2248,7 @@ (define %default-gpm-options (define-record-type* gpm-configuration make-gpm-configuration gpm-configuration? - (gpm gpm-configuration-gpm ;package + (gpm gpm-configuration-gpm ;file-like (default gpm)) (options gpm-configuration-options ;list of strings (default %default-gpm-options))) -- cgit v1.2.3