Merge remote-tracking branch 'origin/master' into core-updates-frozen

36 files changed, 100 insertions, 98 deletions

diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm
index 763a4434e4..043517262f 100644
--- a/gnu/services/admin.scm
+++ b/gnu/services/admin.scm
@@ -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")))
diff --git a/gnu/services/auditd.scm b/gnu/services/auditd.scm
index cffc226ec9..abde811f51 100644
--- a/gnu/services/auditd.scm
+++ b/gnu/services/auditd.scm
@@ -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
 
diff --git a/gnu/services/authentication.scm b/gnu/services/authentication.scm
index d7efc48cd0..cb0ef6d85a 100644
--- a/gnu/services/authentication.scm
+++ b/gnu/services/authentication.scm
@@ -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
diff --git a/gnu/services/avahi.scm b/gnu/services/avahi.scm
index 2dcf1d9c1b..3b8d0512c7 100644
--- a/gnu/services/avahi.scm
+++ b/gnu/services/avahi.scm
@@ -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))
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 20736eb13f..2631478b9e 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -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)
@@ -2225,8 +2225,10 @@ instance."
                      (and device
                           (begin
                             (restart-on-EINTR (swapon device
-                                                      #$(swap-space->flags-bit-mask
-                                                         swap)))
+                                                      #$(if (swap-space? swap)
+                                                            (swap-space->flags-bit-mask
+                                                             swap)
+                                                            0)))
                             #t)))))
         (stop #~(lambda _
                   (let ((device #$device-lookup))
@@ -2246,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)))
diff --git a/gnu/services/cgit.scm b/gnu/services/cgit.scm
index 94ca9e281a..bfc89a40a4 100644
--- a/gnu/services/cgit.scm
+++ b/gnu/services/cgit.scm
@@ -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))
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm
index 83e63fe79c..a69c20adb8 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -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))
diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm
index a9eeb3868b..2e86845e51 100644
--- a/gnu/services/cups.scm
+++ b/gnu/services/cups.scm
@@ -485,13 +485,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
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index 8d266c1cba..39225a4bd6 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -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"))
diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index a895c6374b..85a4c3ec9a 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -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 %default-polkit))
-  (actions  polkit-configuration-actions          ;list of <package>
+  (actions  polkit-configuration-actions          ;list of file-like
             (default '())))
 
 (define %default-polkit
diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm
index 93055eba38..9b8603cc95 100644
--- a/gnu/services/dns.scm
+++ b/gnu/services/dns.scm
@@ -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)
diff --git a/gnu/services/docker.scm b/gnu/services/docker.scm
index c4d48676b5..846ebe8334 100644
--- a/gnu/services/docker.scm
+++ b/gnu/services/docker.scm
@@ -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?
diff --git a/gnu/services/file-sharing.scm b/gnu/services/file-sharing.scm
index 72cd6478d6..e3d681b08f 100644
--- a/gnu/services/file-sharing.scm
+++ b/gnu/services/file-sharing.scm
@@ -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)
diff --git a/gnu/services/ganeti.scm b/gnu/services/ganeti.scm
index ef22d1a331..85adbd7362 100644
--- a/gnu/services/ganeti.scm
+++ b/gnu/services/ganeti.scm
@@ -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.
diff --git a/gnu/services/getmail.scm b/gnu/services/getmail.scm
index 933d820bc5..ce124f6b11 100644
--- a/gnu/services/getmail.scm
+++ b/gnu/services/getmail.scm
@@ -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")
diff --git a/gnu/services/hurd.scm b/gnu/services/hurd.scm
index 61d92b4bda..5cf37adeaf 100644
--- a/gnu/services/hurd.scm
+++ b/gnu/services/hurd.scm
@@ -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
diff --git a/gnu/services/lirc.scm b/gnu/services/lirc.scm
index e95f54280d..1f5adcdd5f 100644
--- a/gnu/services/lirc.scm
+++ b/gnu/services/lirc.scm
@@ -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
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm
index 72dc123f41..4ad6ddb534 100644
--- a/gnu/services/mail.scm
+++ b/gnu/services/mail.scm
@@ -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)))
diff --git a/gnu/services/mcron.scm b/gnu/services/mcron.scm
index 0e675607f3..23760ebda4 100644
--- a/gnu/services/mcron.scm
+++ b/gnu/services/mcron.scm
@@ -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 '())))
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm
index 0fcb7faf89..6ed55453db 100644
--- a/gnu/services/messaging.scm
+++ b/gnu/services/messaging.scm
@@ -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
diff --git a/gnu/services/monitoring.scm b/gnu/services/monitoring.scm
index 5123a8c441..f15450eed5 100644
--- a/gnu/services/monitoring.scm
+++ b/gnu/services/monitoring.scm
@@ -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
diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm
index 7e310b70ec..77841a18d4 100644
--- a/gnu/services/networking.scm
+++ b/gnu/services/networking.scm
@@ -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)))
diff --git a/gnu/services/nix.scm b/gnu/services/nix.scm
index 619e3cae54..df04a85c22 100644
--- a/gnu/services/nix.scm
+++ b/gnu/services/nix.scm
@@ -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))
diff --git a/gnu/services/pm.scm b/gnu/services/pm.scm
index 256c6a7fa7..d91f2b69ce 100644
--- a/gnu/services/pm.scm
+++ b/gnu/services/pm.scm
@@ -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)
diff --git a/gnu/services/rsync.scm b/gnu/services/rsync.scm
index 59faed78f6..6e27edde25 100644
--- a/gnu/services/rsync.scm
+++ b/gnu/services/rsync.scm
@@ -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))
diff --git a/gnu/services/science.scm b/gnu/services/science.scm
index 6f7ac91154..1414789de9 100644
--- a/gnu/services/science.scm
+++ b/gnu/services/science.scm
@@ -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")))
diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm
index 7277273686..b44dbf9d9f 100644
--- a/gnu/services/shepherd.scm
+++ b/gnu/services/shepherd.scm
@@ -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>
 
diff --git a/gnu/services/sound.scm b/gnu/services/sound.scm
index 55610f27e0..1217223a0c 100644
--- a/gnu/services/sound.scm
+++ b/gnu/services/sound.scm
@@ -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))
diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm
index e7bc6100f6..97f74a00f7 100644
--- a/gnu/services/ssh.scm
+++ b/gnu/services/ssh.scm
@@ -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"))
diff --git a/gnu/services/syncthing.scm b/gnu/services/syncthing.scm
index 12ebe7c107..7c3d5b027d 100644
--- a/gnu/services/syncthing.scm
+++ b/gnu/services/syncthing.scm
@@ -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 '()))
diff --git a/gnu/services/telephony.scm b/gnu/services/telephony.scm
index fd90840324..7c83f13b2a 100644
--- a/gnu/services/telephony.scm
+++ b/gnu/services/telephony.scm
@@ -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"))
diff --git a/gnu/services/version-control.scm b/gnu/services/version-control.scm
index 3315e80c6f..defbd65c36 100644
--- a/gnu/services/version-control.scm
+++ b/gnu/services/version-control.scm
@@ -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"))
diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm
index 1a5744ffbf..4222bb4353 100644
--- a/gnu/services/virtualization.scm
+++ b/gnu/services/virtualization.scm
@@ -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)
diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm
index df84905eb3..6004e41d8d 100644
--- a/gnu/services/vpn.scm
+++ b/gnu/services/vpn.scm
@@ -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"))
diff --git a/gnu/services/web.scm b/gnu/services/web.scm
index f1c3a2f75e..e5cc6343b5 100644
--- a/gnu/services/web.scm
+++ b/gnu/services/web.scm
@@ -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"))
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index b6857a8202..82a7d25602 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -163,7 +163,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
@@ -181,7 +181,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)))