~ruther/guix-local

892f1b7273d57b25940700877a02618fe826cc08 — Tobias Geerinckx-Rice 4 years ago dc9be12
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.
M gnu/services/admin.scm => gnu/services/admin.scm +1 -1
@@ 149,7 149,7 @@ for ROTATION."
(define-record-type* <rottlog-configuration>
  rottlog-configuration make-rottlog-configuration
  rottlog-configuration?
  (rottlog            rottlog-rottlog             ;package
  (rottlog            rottlog-rottlog             ;file-like
                      (default rottlog))
  (rc-file            rottlog-rc-file             ;file-like
                      (default (file-append rottlog "/etc/rc")))

M gnu/services/auditd.scm => gnu/services/auditd.scm +1 -1
@@ 46,7 46,7 @@ ignore\ndisk_error_action = syslog\n"))
(define-record-type* <auditd-configuration>
  auditd-configuration make-auditd-configuration
  auditd-configuration?
  (audit                   auditd-configuration-audit                          ; package
  (audit                   auditd-configuration-audit                          ; file-like
                           (default audit))
  (configuration-directory auditd-configuration-configuration-directory))      ; file-like


M gnu/services/authentication.scm => gnu/services/authentication.scm +2 -2
@@ 45,7 45,7 @@
            nslcd-service-type))

(define-configuration fprintd-configuration
  (fprintd      (package fprintd)
  (fprintd      (file-like fprintd)
                "The fprintd package"))

(define (fprintd-dbus-service config)


@@ 213,7 213,7 @@

(define-configuration nslcd-configuration
  (nss-pam-ldapd
   (package nss-pam-ldapd)
   (file-like nss-pam-ldapd)
   "The NSS-PAM-LDAPD package to use.")

  ;; Runtime options

M gnu/services/avahi.scm => gnu/services/avahi.scm +1 -1
@@ 52,7 52,7 @@
(define-record-type* <avahi-configuration>
  avahi-configuration make-avahi-configuration
  avahi-configuration?
  (avahi             avahi-configuration-avahi    ;<package>
  (avahi             avahi-configuration-avahi    ;file-like
                     (default avahi))
  (debug?            avahi-configuration-debug?   ;Boolean
                     (default #f))

M gnu/services/base.scm => gnu/services/base.scm +10 -10
@@ 560,7 560,7 @@ down.")))
(define-record-type* <rngd-configuration>
  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 @@ the message of the day, among other things."
(define-record-type* <agetty-configuration>
  agetty-configuration make-agetty-configuration
  agetty-configuration?
  (agetty           agetty-configuration-agetty   ;<package>
  (agetty           agetty-configuration-agetty   ;file-like
                    (default util-linux))
  (tty              agetty-configuration-tty)     ;string | #f
  (term             agetty-term                   ;string | #f


@@ 1043,7 1043,7 @@ the tty to run, among other things."
(define-record-type* <mingetty-configuration>
  mingetty-configuration make-mingetty-configuration
  mingetty-configuration?
  (mingetty         mingetty-configuration-mingetty ;<package>
  (mingetty         mingetty-configuration-mingetty ;file-like
                    (default mingetty))
  (tty              mingetty-configuration-tty)     ;string
  (auto-login       mingetty-auto-login             ;string | #f


@@ 1115,9 1115,9 @@ the tty to run, among other things."
  ;; TODO: See nscd.conf in glibc for other options to add.
  (caches     nscd-configuration-caches           ;list of <nscd-cache>
              (default %nscd-default-caches))
  (name-services nscd-configuration-name-services ;list of <packages>
  (name-services nscd-configuration-name-services ;list of file-like
                 (default '()))
  (glibc      nscd-configuration-glibc            ;<package>
  (glibc      nscd-configuration-glibc            ;file-like
              (default glibc)))

(define-record-type* <nscd-cache> nscd-cache make-nscd-cache


@@ 1516,7 1516,7 @@ archive' public keys, with GUIX."
(define-record-type* <guix-configuration>
  guix-configuration make-guix-configuration
  guix-configuration?
  (guix             guix-configuration-guix       ;<package>
  (guix             guix-configuration-guix       ;file-like
                    (default guix))
  (build-group      guix-configuration-build-group ;string
                    (default "guixbuild"))


@@ 1769,7 1769,7 @@ proxy of 'guix-daemon'...~%")
(define-record-type* <guix-publish-configuration>
  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 @@ command that allows you to share pre-built binaries with others over HTTP.")))
(define-record-type* <udev-configuration>
  udev-configuration make-udev-configuration
  udev-configuration?
  (udev   udev-configuration-udev                 ;<package>
  (udev   udev-configuration-udev                 ;file-like
          (default eudev))
  (rules  udev-configuration-rules                ;list of <package>
  (rules  udev-configuration-rules                ;list of file-like
          (default '())))

(define (udev-rules-union packages)


@@ 2248,7 2248,7 @@ instance."

(define-record-type* <gpm-configuration>
  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)))

M gnu/services/cgit.scm => gnu/services/cgit.scm +2 -2
@@ 319,7 319,7 @@ after this option will inherit the current section name.")
;; <repository-cgit-configuration>, <nginx-server-configuration>, <package>.
(define-configuration cgit-configuration
  (package
   (package cgit)
   (file-like cgit)
   "The CGIT package.")
  (nginx
   (nginx-server-configuration-list (list %cgit-configuration-nginx))


@@ 673,7 673,7 @@ for cgit to allow access to that repository.")

(define-configuration opaque-cgit-configuration
  (cgit
   (package cgit)
   (file-like cgit)
   "The cgit package.")
  (cgitrc
   (string (configuration-missing-field 'opaque-cgit-configuration 'cgitrc))

M gnu/services/cuirass.scm => gnu/services/cuirass.scm +2 -2
@@ 85,7 85,7 @@
(define-record-type* <cuirass-configuration>
  cuirass-configuration make-cuirass-configuration
  cuirass-configuration?
  (cuirass          cuirass-configuration-cuirass ;package
  (cuirass          cuirass-configuration-cuirass ;file-like
                    (default cuirass))
  (log-file         cuirass-configuration-log-file ;string
                    (default "/var/log/cuirass.log"))


@@ 327,7 327,7 @@
(define-record-type* <cuirass-remote-worker-configuration>
  cuirass-remote-worker-configuration make-cuirass-remote-worker-configuration
  cuirass-remote-worker-configuration?
  (cuirass          cuirass-remote-worker-configuration-cuirass ;package
  (cuirass          cuirass-remote-worker-configuration-cuirass ;file-like
                    (default cuirass))
  (workers          cuirass-remote-worker-workers ;int
                    (default 1))

M gnu/services/cups.scm => gnu/services/cups.scm +2 -2
@@ 482,13 482,13 @@ programs.")
    (serialize-space-separated-string-list field-name vars)))

(define (package-list? val)
  (and (list? val) (and-map package? val)))
  (and (list? val) (and-map file-like? val)))
(define (serialize-package-list field-name val)
  #f)

(define-configuration cups-configuration
  (cups
   (package cups)
   (file-like cups)
   "The CUPS package.")
  (extensions
   (package-list (list brlaser cups-filters epson-inkjet-printer-escpr

M gnu/services/databases.scm => gnu/services/databases.scm +3 -3
@@ 164,7 164,7 @@ host	all	all	::1/128 	md5"))
(define-record-type* <postgresql-configuration>
  postgresql-configuration make-postgresql-configuration
  postgresql-configuration?
  (postgresql         postgresql-configuration-postgresql) ;<package>
  (postgresql         postgresql-configuration-postgresql) ;file-like
  (port               postgresql-configuration-port
                      (default 5432))
  (locale             postgresql-configuration-locale


@@ 448,7 448,7 @@ created after the PostgreSQL database is started.")))
(define-record-type* <memcached-configuration>
  memcached-configuration make-memcached-configuration
  memcached-configuration?
  (memcached          memcached-configuration-memcached ;<package>
  (memcached          memcached-configuration-memcached ;file-like
                      (default memcached))
  (interfaces         memcached-configuration-interfaces
                      (default '("0.0.0.0")))


@@ 693,7 693,7 @@ FLUSH PRIVILEGES;
(define-record-type* <redis-configuration>
  redis-configuration make-redis-configuration
  redis-configuration?
  (redis             redis-configuration-redis ;<package>
  (redis             redis-configuration-redis ;file-like
                     (default redis))
  (bind              redis-configuration-bind
                     (default "127.0.0.1"))

M gnu/services/dbus.scm => gnu/services/dbus.scm +3 -3
@@ 50,7 50,7 @@
(define-record-type* <dbus-configuration>
  dbus-configuration make-dbus-configuration
  dbus-configuration?
  (dbus      dbus-configuration-dbus              ;<package>
  (dbus      dbus-configuration-dbus              ;file-like
             (default dbus))
  (services  dbus-configuration-services          ;list of <package>
             (default '())))


@@ 300,9 300,9 @@ tuples, are all set as environment variables when the bus daemon launches it."
(define-record-type* <polkit-configuration>
  polkit-configuration make-polkit-configuration
  polkit-configuration?
  (polkit   polkit-configuration-polkit           ;<package>
  (polkit   polkit-configuration-polkit           ;file-like
            (default polkit))
  (actions  polkit-configuration-actions          ;list of <package>
  (actions  polkit-configuration-actions          ;list of file-like
            (default '())))

(define %polkit-accounts

M gnu/services/dns.scm => gnu/services/dns.scm +4 -4
@@ 308,8 308,8 @@
      (error-out "remote id must be a non empty string."))))

(define (verify-knot-configuration config)
  (unless (package? (knot-configuration-knot config))
    (error-out "knot configuration field must be a package."))
  (unless (file-like? (knot-configuration-knot config))
    (error-out "knot configuration field must be a file-like object."))
  (unless (string? (knot-configuration-run-directory config))
    (error-out "run-directory must be a string."))
  (unless (list? (knot-configuration-includes config))


@@ 732,7 732,7 @@ cache.size = 100 * MB
  dnsmasq-configuration make-dnsmasq-configuration
  dnsmasq-configuration?
  (package          dnsmasq-configuration-package
                    (default dnsmasq))  ;package
                    (default dnsmasq))  ;file-like
  (no-hosts?        dnsmasq-configuration-no-hosts?
                    (default #f))       ;boolean
  (port             dnsmasq-configuration-port


@@ 905,7 905,7 @@ cache.size = 100 * MB

(define-configuration ddclient-configuration
  (ddclient
   (package ddclient)
   (file-like ddclient)
   "The ddclient package.")
  (daemon
   (integer 300)

M gnu/services/docker.scm => gnu/services/docker.scm +4 -4
@@ 41,16 41,16 @@

(define-configuration docker-configuration
  (docker
   (package docker)
   (file-like docker)
   "Docker daemon package.")
  (docker-cli
   (package docker-cli)
   (file-like docker-cli)
   "Docker client package.")
  (containerd
   (package containerd)
   (file-like containerd)
   "containerd package.")
  (proxy
   (package docker-libnetwork-cmd-proxy)
   (file-like docker-libnetwork-cmd-proxy)
   "The proxy package to support inter-container and outside-container
loop-back communications.")
  (enable-proxy?

M gnu/services/file-sharing.scm => gnu/services/file-sharing.scm +1 -1
@@ 259,7 259,7 @@ type generated and used by Transmission clients, suitable for passing to the
(define-configuration transmission-daemon-configuration
  ;; Settings internal to this service definition.
  (transmission
   (package transmission)
   (file-like transmission)
   "The Transmission package to use.")
  (stop-wait-period
   (non-negative-integer 10)

M gnu/services/ganeti.scm => gnu/services/ganeti.scm +10 -10
@@ 190,7 190,7 @@
(define-record-type* <ganeti-noded-configuration>
  ganeti-noded-configuration make-ganeti-noded-configuration
  ganeti-noded-configuration?
  (ganeti      ganeti-noded-configuration-ganeti        ;<package>
  (ganeti      ganeti-noded-configuration-ganeti        ;file-like
               (default ganeti))
  (port        ganeti-noded-configuration-port          ;integer
               (default 1811))


@@ 256,7 256,7 @@ for the node functions in the Ganeti system.")))
(define-record-type* <ganeti-confd-configuration>
  ganeti-confd-configuration make-ganeti-confd-configuration
  ganeti-confd-configuration?
  (ganeti      ganeti-confd-configuration-ganeti        ;<package>
  (ganeti      ganeti-confd-configuration-ganeti        ;file-like
               (default ganeti))
  (port        ganeti-confd-configuration-port          ;integer
               (default 1814))


@@ 298,7 298,7 @@ related to the configuration of a Ganeti cluster.")))
(define-record-type* <ganeti-wconfd-configuration>
  ganeti-wconfd-configuration make-ganeti-wconfd-configuration
  ganeti-wconfd-configuration?
  (ganeti      ganeti-wconfd-configuration-ganeti       ;<package>
  (ganeti      ganeti-wconfd-configuration-ganeti       ;file-like
               (default ganeti))
  (no-voting?  ganeti-wconfd-configuration-no-voting?   ;Boolean
               (default #f))


@@ 389,7 389,7 @@ appropriate requests to this daemon.")))
(define-record-type* <ganeti-luxid-configuration>
  ganeti-luxid-configuration make-ganeti-luxid-configuration
  ganeti-luxid-configuration?
  (ganeti      ganeti-luxid-configuration-ganeti        ;<package>
  (ganeti      ganeti-luxid-configuration-ganeti        ;file-like
               (default ganeti))
  (no-voting?  ganeti-luxid-configuration-no-voting?    ;Boolean
               (default #f))


@@ 436,7 436,7 @@ be submitted via this daemon and it schedules and starts them.")))
(define-record-type* <ganeti-rapi-configuration>
  ganeti-rapi-configuration make-ganeti-rapi-configuration
  ganeti-rapi-configuration?
  (ganeti      ganeti-rapi-configuration-ganeti         ;<package>
  (ganeti      ganeti-rapi-configuration-ganeti         ;file-like
               (default ganeti))
  (require-authentication?
   ganeti-rapi-configuration-require-authentication?    ;Boolean


@@ 509,7 509,7 @@ for Ganeti clusters.")))
(define-record-type* <ganeti-kvmd-configuration>
  ganeti-kvmd-configuration make-ganeti-kvmd-configuration
  ganeti-kvmd-configuration?
  (ganeti      ganeti-kvmd-configuration-ganeti         ;<package>
  (ganeti      ganeti-kvmd-configuration-ganeti         ;file-like
               (default ganeti))
  (debug?      ganeti-kvmd-configuration-debug?         ;Boolean
               (default #f)))


@@ 555,7 555,7 @@ communicated to Ganeti via a special file in the file system.")))
(define-record-type* <ganeti-mond-configuration>
  ganeti-mond-configuration make-ganeti-mond-configuration
  ganeti-mond-configuration?
  (ganeti      ganeti-mond-configuration-ganeti         ;<package>
  (ganeti      ganeti-mond-configuration-ganeti         ;file-like
               (default ganeti))
  (port        ganeti-mond-configuration-port           ;integer
               (default 1815))


@@ 596,7 596,7 @@ provide the collected information through a HTTP interface.")))
(define-record-type* <ganeti-metad-configuration>
  ganeti-metad-configuration make-ganeti-metad-configuration
  ganeti-metad-configuration?
  (ganeti      ganeti-metad-configuration-ganeti        ;<package>
  (ganeti      ganeti-metad-configuration-ganeti        ;file-like
               (default ganeti))
  (port        ganeti-metad-configuration-port          ;integer
               (default 80))


@@ 642,7 642,7 @@ information to OS install scripts or instances.")))
(define-record-type* <ganeti-watcher-configuration>
  ganeti-watcher-configuration make-ganeti-watcher-configuration
  ganeti-watcher-configuration?
  (ganeti        ganeti-watcher-configuration-ganeti        ;<package>
  (ganeti        ganeti-watcher-configuration-ganeti        ;file-like
                 (default ganeti))
  (schedule      ganeti-watcher-configuration-schedule      ;list | string
                 (default '(next-second-from


@@ 705,7 705,7 @@ is declared offline by known master candidates.")))
(define-record-type* <ganeti-cleaner-configuration>
  ganeti-cleaner-configuration make-ganeti-cleaner-configuration
  ganeti-cleaner-configuration?
  (ganeti          ganeti-cleaner-configuration-ganeti          ;<package>
  (ganeti          ganeti-cleaner-configuration-ganeti          ;file-like
                   (default ganeti))
  (master-schedule ganeti-cleaner-configuration-master-schedule ;list | string
                   ;; Run the master cleaner at 01:45 every day.

M gnu/services/getmail.scm => gnu/services/getmail.scm +1 -1
@@ 246,7 246,7 @@ lines.")
   (symbol "unset")
   "A symbol to identify the getmail service.")
  (package
   (package getmail)
   (file-like getmail)
   "The getmail package to use.")
  (user
   (string "getmail")

M gnu/services/hurd.scm => gnu/services/hurd.scm +2 -2
@@ 42,7 42,7 @@
(define-record-type* <hurd-console-configuration>
  hurd-console-configuration make-hurd-console-configuration
  hurd-console-configuration?
  (hurd   hurd-console-configuration-hurd ;package
  (hurd   hurd-console-configuration-hurd ;file-like
          (default hurd)))

(define (hurd-console-shepherd-service config)


@@ 80,7 80,7 @@
(define-record-type* <hurd-getty-configuration>
  hurd-getty-configuration make-hurd-getty-configuration
  hurd-getty-configuration?
  (hurd       hurd-getty-configuration-hurd  ;<package>
  (hurd       hurd-getty-configuration-hurd  ;file-like
              (default hurd))
  (tty        hurd-getty-configuration-tty)  ;string
  (baud-rate  hurd-getty-configuration-baud-rate

M gnu/services/lirc.scm => gnu/services/lirc.scm +1 -1
@@ 38,7 38,7 @@
(define-record-type* <lirc-configuration>
  lirc-configuration make-lirc-configuration
  lirc-configuation?
  (lirc          lirc-configuration-lirc          ;<package>
  (lirc          lirc-configuration-lirc          ;file-like
                 (default lirc))
  (device        lirc-configuration-device)       ;string
  (driver        lirc-configuration-driver)       ;string

M gnu/services/mail.scm => gnu/services/mail.scm +3 -3
@@ 498,7 498,7 @@ as @code{#t}.)")

(define-configuration dovecot-configuration
  (dovecot
   (package dovecot)
   (file-like dovecot)
   "The dovecot package.")

  (listen


@@ 1472,7 1472,7 @@ greyed out, instead of only later giving \"not selectable\" popup error.

(define-configuration opaque-dovecot-configuration
  (dovecot
   (package dovecot)
   (file-like dovecot)
   "The dovecot package.")

  (string


@@ 1764,7 1764,7 @@ match from local for any action outbound
(define-record-type* <exim-configuration> exim-configuration
  make-exim-configuration
  exim-configuration?
  (package       exim-configuration-package ;<package>
  (package       exim-configuration-package ;file-like
                 (default exim))
  (config-file   exim-configuration-config-file ;file-like
                 (default #f)))

M gnu/services/mcron.scm => gnu/services/mcron.scm +1 -1
@@ 51,7 51,7 @@
(define-record-type* <mcron-configuration> mcron-configuration
  make-mcron-configuration
  mcron-configuration?
  (mcron             mcron-configuration-mcron    ;package
  (mcron             mcron-configuration-mcron    ;file-like
                     (default mcron))
  (jobs              mcron-configuration-jobs     ;list of <mcron-job>
                     (default '())))

M gnu/services/messaging.scm => gnu/services/messaging.scm +2 -2
@@ 333,7 333,7 @@ can create such a file with:

  (define-all-configurations prosody-configuration
    (prosody
     (package prosody)
     (file-like prosody)
     "The Prosody package."
     global)



@@ 623,7 623,7 @@ See also @url{https://prosody.im/doc/modules/mod_muc}."

(define-configuration opaque-prosody-configuration
  (prosody
   (package prosody)
   (file-like prosody)
   "The prosody package.")

  (prosody.cfg.lua

M gnu/services/monitoring.scm => gnu/services/monitoring.scm +3 -3
@@ 247,7 247,7 @@ Prometheus.")

(define-configuration zabbix-server-configuration
  (zabbix-server
   (package zabbix-server)
   (file-like zabbix-server)
   "The zabbix-server package.")
  (user
   (string "zabbix")


@@ 385,7 385,7 @@ configuration file."))

(define-configuration zabbix-agent-configuration
  (zabbix-agent
   (package zabbix-agentd)
   (file-like zabbix-agentd)
   "The zabbix-agent package.")
  (user
   (string "zabbix")


@@ 529,7 529,7 @@ fastcgi_param PHP_VALUE \"post_max_size = 16M
(define-configuration zabbix-front-end-configuration
  ;; TODO: Specify zabbix front-end package.
  ;; (zabbix-
  ;;  (package zabbix-front-end)
  ;;  (file-like zabbix-front-end)
  ;;  "The zabbix-front-end package.")
  (nginx
   (nginx-server-configuration-list

M gnu/services/networking.scm => gnu/services/networking.scm +5 -5
@@ 311,7 311,7 @@ Protocol (DHCP) client, on all the non-loopback network interfaces.")))
(define-record-type* <dhcpd-configuration>
  dhcpd-configuration make-dhcpd-configuration
  dhcpd-configuration?
  (package   dhcpd-configuration-package ;<package>
  (package   dhcpd-configuration-package ;file-like
             (default isc-dhcp))
  (config-file   dhcpd-configuration-config-file ;file-like
                 (default #f))


@@ 743,7 743,7 @@ demand.")))
;;; can evaluate: (configuration->documentation 'opendht-configuration)
(define-configuration/no-serialization opendht-configuration
  (opendht
   (package opendht)
   (file-like opendht)
   "The @code{opendht} package to use.")
  (peer-discovery?
   (boolean #false)


@@ 1149,7 1149,7 @@ and @command{wicd-curses} user interfaces."
                   (default network-manager))
  (dns network-manager-configuration-dns
       (default "default"))
  (vpn-plugins network-manager-configuration-vpn-plugins ;list of <package>
  (vpn-plugins network-manager-configuration-vpn-plugins ;list of file-like
               (default '())))

(define network-manager-activation


@@ 1452,7 1452,7 @@ whatever the thing is supposed to do).")))
(define-record-type* <wpa-supplicant-configuration>
  wpa-supplicant-configuration make-wpa-supplicant-configuration
  wpa-supplicant-configuration?
  (wpa-supplicant     wpa-supplicant-configuration-wpa-supplicant ;<package>
  (wpa-supplicant     wpa-supplicant-configuration-wpa-supplicant ;file-like
                      (default wpa-supplicant))
  (requirement        wpa-supplicant-configuration-requirement    ;list of symbols
                      (default '(user-processes loopback syslogd)))


@@ 2124,7 2124,7 @@ of the IPFS peer-to-peer storage network.")))
(define-record-type* <keepalived-configuration>
  keepalived-configuration make-keepalived-configuration
  keepalived-configuration?
  (keepalived  keepalived-configuration-keepalived  ;<package>
  (keepalived  keepalived-configuration-keepalived  ;file-like
               (default keepalived))
  (config-file keepalived-configuration-config-file ;file-like
               (default #f)))

M gnu/services/nix.scm => gnu/services/nix.scm +1 -1
@@ 50,7 50,7 @@
(define-record-type* <nix-configuration>
  nix-configuration make-nix-configuration
  nix-configuration?
  (package             nix-configuration-package ;package
  (package             nix-configuration-package ;file-like
                       (default nix))
  (sandbox             nix-configuration-sandbox ;boolean
                       (default #t))

M gnu/services/pm.scm => gnu/services/pm.scm +2 -2
@@ 84,7 84,7 @@

(define-configuration tlp-configuration
  (tlp
   (package tlp)
   (file-like tlp)
   "The TLP package.")

  (tlp-enable?


@@ 421,7 421,7 @@ shutdown on system startup."))
  thermald-configuration?
  (ignore-cpuid-check? thermald-ignore-cpuid-check?    ;boolean
                       (default #f))
  (thermald            thermald-thermald               ;package
  (thermald            thermald-thermald               ;file-like
                       (default thermald)))

(define (thermald-shepherd-service config)

M gnu/services/rsync.scm => gnu/services/rsync.scm +1 -1
@@ 43,7 43,7 @@
  rsync-configuration
  make-rsync-configuration
  rsync-configuration?
  (package       rsync-configuration-package              ; package
  (package       rsync-configuration-package              ; file-like
                 (default rsync))
  (address       rsync-configuration-address              ; string | #f
                 (default #f))

M gnu/services/science.scm => gnu/services/science.scm +1 -1
@@ 35,7 35,7 @@
  rshiny-configuration
  make-rshiny-configuration
  rshiny-configuration?
  (package          rshiny-configuration-package    ; package
  (package          rshiny-configuration-package    ; file-like
                    (default r-shiny))
  (binary           rshiny-configuration-binary     ; string
                    (default "rshiny")))

M gnu/services/shepherd.scm => gnu/services/shepherd.scm +1 -1
@@ 88,7 88,7 @@
  shepherd-configuration make-shepherd-configuration
  shepherd-configuration?
  (shepherd shepherd-configuration-shepherd
            (default shepherd)) ; package
            (default shepherd)) ; file-like
  (services shepherd-configuration-services
            (default '()))) ; list of <shepherd-service>


M gnu/services/sound.scm => gnu/services/sound.scm +1 -1
@@ 55,7 55,7 @@

(define-record-type* <alsa-configuration>
  alsa-configuration make-alsa-configuration alsa-configuration?
  (alsa-plugins alsa-configuration-alsa-plugins ;<package>
  (alsa-plugins alsa-configuration-alsa-plugins ;file-like
                (default alsa-plugins))
  (pulseaudio?   alsa-configuration-pulseaudio? ;boolean
                 (default #t))

M gnu/services/ssh.scm => gnu/services/ssh.scm +2 -2
@@ 283,7 283,7 @@ The other options should be self-descriptive."
(define-record-type* <openssh-configuration>
  openssh-configuration make-openssh-configuration
  openssh-configuration?
  ;; <package>
  ;; file-like object
  (openssh               openssh-configuration-openssh
                         (default openssh))
  ;; string


@@ 763,7 763,7 @@ object."
(define-record-type* <webssh-configuration>
  webssh-configuration make-webssh-configuration
  webssh-configuration?
  (package     webssh-configuration-package     ;package
  (package     webssh-configuration-package     ;file-like
               (default webssh))
  (user-name   webssh-configuration-user-name   ;string
               (default "webssh"))

M gnu/services/syncthing.scm => gnu/services/syncthing.scm +1 -1
@@ 37,7 37,7 @@
(define-record-type* <syncthing-configuration>
  syncthing-configuration make-syncthing-configuration
  syncthing-configuration?
  (syncthing syncthing-configuration-syncthing ;<package>
  (syncthing syncthing-configuration-syncthing ;file-like
             (default syncthing))
  (arguments syncthing-configuration-arguments ;list of strings
             (default '()))

M gnu/services/telephony.scm => gnu/services/telephony.scm +4 -4
@@ 227,13 227,13 @@ SET-ACCOUNT-DETAILS."

(define-configuration/no-serialization jami-configuration
  (jamid
   (package libring)
   (file-like libring)
   "The Jami daemon package to use.")
  (dbus
   (package dbus)
   (file-like dbus)
   "The D-Bus package to use to start the required D-Bus session.")
  (nss-certs
   (package nss-certs)
   (file-like nss-certs)
   "The nss-certs package to use to provide TLS certificates.")
  (enable-logging?
   (boolean #t)


@@ 755,7 755,7 @@ normal user D-Bus session bus.")))
(define-record-type* <murmur-configuration> murmur-configuration
  make-murmur-configuration
  murmur-configuration?
  (package               murmur-configuration-package ;<package>
  (package               murmur-configuration-package ;file-like
                         (default mumble))
  (user                  murmur-configuration-user
                         (default "murmur"))

M gnu/services/version-control.scm => gnu/services/version-control.scm +2 -2
@@ 91,7 91,7 @@
  git-daemon-configuration
  make-git-daemon-configuration
  git-daemon-configuration?
  (package          git-daemon-configuration-package        ;package
  (package          git-daemon-configuration-package        ;file-like
                    (default git))
  (export-all?      git-daemon-configuration-export-all     ;boolean
                    (default #f))


@@ 197,7 197,7 @@ access to exported repositories under @file{/srv/git}."
  git-http-configuration
  make-git-http-configuration
  git-http-configuration?
  (package          git-http-configuration-package        ;package
  (package          git-http-configuration-package        ;file-like
                    (default git))
  (git-root         git-http-configuration-git-root       ;string
                    (default "/srv/git"))

M gnu/services/virtualization.scm => gnu/services/virtualization.scm +4 -4
@@ 134,10 134,10 @@

(define-configuration libvirt-configuration
  (libvirt
   (package libvirt)
   (file-like libvirt)
   "Libvirt package.")
  (qemu
   (package qemu)
   (file-like qemu)
   "Qemu package.")

  (listen-tls?


@@ 859,7 859,7 @@ functionality of the kernel Linux.")))

(define-configuration qemu-guest-agent-configuration
  (qemu
   (package qemu-minimal)
   (file-like qemu-minimal)
   "QEMU package.")
  (device
   (string "")


@@ 974,7 974,7 @@ that will be listening to receive secret keys on port 1004, TCP."
  hurd-vm-configuration?
  (os          hurd-vm-configuration-os                 ;<operating-system>
               (default %hurd-vm-operating-system))
  (qemu        hurd-vm-configuration-qemu               ;<package>
  (qemu        hurd-vm-configuration-qemu               ;file-like
               (default qemu-minimal))
  (image       hurd-vm-configuration-image              ;string
               (thunked)

M gnu/services/vpn.scm => gnu/services/vpn.scm +3 -3
@@ 302,7 302,7 @@ client.  Each file is named after the name of the client."
(define-split-configuration openvpn-client-configuration
  openvpn-server-configuration
  ((openvpn
    (package openvpn)
    (file-like openvpn)
    "The OpenVPN package.")

   (pid-file


@@ 561,7 561,7 @@ is truncated and rewritten every minute.")
(define-record-type* <strongswan-configuration>
  strongswan-configuration make-strongswan-configuration
  strongswan-configuration?
  (strongswan      strongswan-configuration-strongswan ;<package>
  (strongswan      strongswan-configuration-strongswan ;file-like
                   (default strongswan))
  (ipsec-conf      strongswan-configuration-ipsec-conf ;string|#f
                   (default #f))


@@ 704,7 704,7 @@ strongSwan.")))
(define-record-type* <wireguard-configuration>
  wireguard-configuration make-wireguard-configuration
  wireguard-configuration?
  (wireguard          wireguard-configuration-wireguard ;<package>
  (wireguard          wireguard-configuration-wireguard ;file-like
                      (default wireguard-tools))
  (interface          wireguard-configuration-interface ;string
                      (default "wg0"))

M gnu/services/web.scm => gnu/services/web.scm +7 -7
@@ 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"))

M gnu/services/xorg.scm => gnu/services/xorg.scm +2 -2
@@ 161,7 161,7 @@
(define-record-type* <xorg-configuration>
  xorg-configuration make-xorg-configuration
  xorg-configuration?
  (modules          xorg-configuration-modules    ;list of packages
  (modules          xorg-configuration-modules    ;list of file-like
                    (thunked)
                    ; filter out modules not supported on current system
                    (default (filter


@@ 179,7 179,7 @@
                    (default #f))
  (extra-config     xorg-configuration-extra-config ;list of strings
                    (default '()))
  (server           xorg-configuration-server     ;package
  (server           xorg-configuration-server     ;file-like
                    (default xorg-server))
  (server-arguments xorg-configuration-server-arguments ;list of strings
                    (default %default-xorg-server-arguments)))