1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-27 11:32:21 +02:00

services: Accept <inferior-package>s in lieu of <package>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.
This commit is contained in:
Tobias Geerinckx-Rice
2021-11-18 22:44:26 +01:00
parent dc9be12eaf
commit 892f1b7273
36 changed files with 96 additions and 96 deletions
+7 -7
View File
@@ -535,7 +535,7 @@
(define-record-type* <nginx-configuration>
nginx-configuration make-nginx-configuration
nginx-configuration?
(nginx nginx-configuration-nginx ;<package>
(nginx nginx-configuration-nginx ;file-like
(default nginx))
(log-directory nginx-configuration-log-directory ;string
(default "/var/log/nginx"))
@@ -552,9 +552,9 @@
(modules nginx-configuration-modules (default '()))
(global-directives nginx-configuration-global-directives
(default '((events . ()))))
(lua-package-path nginx-lua-package-path ;list of <package>
(lua-package-path nginx-lua-package-path ;list of file-like
(default #f))
(lua-package-cpath nginx-lua-package-cpath ;list of <package>
(lua-package-cpath nginx-lua-package-cpath ;list of file-like
(default #f))
(extra-content nginx-configuration-extra-content
(default ""))
@@ -803,7 +803,7 @@ of index files."
(define-record-type* <fcgiwrap-configuration> fcgiwrap-configuration
make-fcgiwrap-configuration
fcgiwrap-configuration?
(package fcgiwrap-configuration-package ;<package>
(package fcgiwrap-configuration-package ;file-like
(default fcgiwrap))
(socket fcgiwrap-configuration-socket
(default "tcp:127.0.0.1:9000"))
@@ -872,7 +872,7 @@ of index files."
(define-record-type* <php-fpm-configuration> php-fpm-configuration
make-php-fpm-configuration
php-fpm-configuration?
(php php-fpm-configuration-php ;<package>
(php php-fpm-configuration-php ;file-like
(default php))
(socket php-fpm-configuration-socket
(default (string-append "/var/run/php"
@@ -1107,7 +1107,7 @@ a webserver.")
hpcguix-web-configuration make-hpcguix-web-configuration
hpcguix-web-configuration?
(package hpcguix-web-package (default hpcguix-web)) ;<package>
(package hpcguix-web-package (default hpcguix-web)) ;file-like
;; Specs is gexp of hpcguix-web configuration file
(specs hpcguix-web-configuration-specs)
@@ -1348,7 +1348,7 @@ files.")
(define-record-type* <varnish-configuration>
varnish-configuration make-varnish-configuration
varnish-configuration?
(package varnish-configuration-package ;<package>
(package varnish-configuration-package ;file-like
(default varnish))
(name varnish-configuration-name ;string
(default "default"))