2015-05-01 13:36:10 -04:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2022-04-29 06:24:20 -04:00
|
|
|
|
;;; Copyright © 2014-2022 Ludovic Courtès <ludo@gnu.org>
|
2015-05-01 13:36:10 -04:00
|
|
|
|
;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
|
2015-09-03 17:12:38 -04:00
|
|
|
|
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
2016-06-15 11:14:01 -04:00
|
|
|
|
;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
|
2023-02-16 12:21:39 -05:00
|
|
|
|
;;; Copyright © 2017, 2020, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
mailmap: Update entries for Nikita.
* .mailmap: change email and name for Nikita.
* Makefile.am, doc/guix.texi, etc/completion/fish/guix.fish,
gnu/packages/accessibility.scm, gnu/packages/admin.scm,
gnu/packages/audio.scm, gnu/packages/autotools.scm, gnu/packages/cdrom.scm,
gnu/packages/check.scm, gnu/packages/cinnamon.scm,
gnu/packages/compression.scm, gnu/packages/crypto.scm,
gnu/packages/databases.scm, gnu/packages/django.scm, gnu/packages/dns.scm,
gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm,
gnu/packages/enlightenment.scm, gnu/packages/erlang.scm,
gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/forth.scm,
gnu/packages/fvwm.scm, gnu/packages/games.scm, gnu/packages/gl.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile-xyz.scm,
gnu/packages/haskell-apps.scm, gnu/packages/haskell-check.scm,
gnu/packages/haskell-crypto.scm, gnu/packages/haskell-xyz.scm,
gnu/packages/haskell.scm, gnu/packages/image-viewers.scm,
gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/language.scm,
gnu/packages/libcanberra.scm, gnu/packages/linux.scm,
gnu/packages/lisp-xyz.scm, gnu/packages/lisp.scm, gnu/packages/lolcode.scm,
gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/mail.scm,
gnu/packages/markup.scm, gnu/packages/mate.scm, gnu/packages/maths.scm,
gnu/packages/mc.scm, gnu/packages/messaging.scm, gnu/packages/music.scm,
gnu/packages/ncurses.scm, gnu/packages/networking.scm,
gnu/packages/nickle.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm,
gnu/packages/perl-check.scm, gnu/packages/perl.scm,
gnu/packages/python-compression.scm, gnu/packages/python-crypto.scm,
gnu/packages/python-web.scm, gnu/packages/python-xyz.scm,
gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/ruby.scm,
gnu/packages/rust.scm, gnu/packages/scheme.scm,
gnu/packages/serialization.scm, gnu/packages/shells.scm,
gnu/packages/ssh.scm, gnu/packages/suckless.scm, gnu/packages/tbb.scm,
gnu/packages/telephony.scm, gnu/packages/text-editors.scm,
gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm,
gnu/packages/tor.scm, gnu/packages/version-control.scm,
gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/web.scm,
gnu/packages/wm.scm, gnu/packages/xdisorg.scm, gnu/packages/xfce.scm,
gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/services/certbot.scm,
gnu/services/desktop.scm, gnu/services/version-control.scm,
gnu/services/web.scm, guix/import/hackage.scm, guix/licenses.scm: Likewise.
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2020-05-11 07:05:45 -04:00
|
|
|
|
;;; Copyright © 2017 Nikita <nikita@n0.is>
|
2017-07-31 07:04:22 -04:00
|
|
|
|
;;; Copyright © 2017, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
2022-12-29 02:15:42 -05:00
|
|
|
|
;;; Copyright © 2018, 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
|
2023-02-28 12:11:08 -05:00
|
|
|
|
;;; Copyright © 2018, 2023 Ricardo Wurmus <rekado@elephly.net>
|
services: Improve the upower-configuration record.
Copy the defaults from the upower-service procedure to the
<upower-configuration> record type. This will allow making it the default
value for the upower-service-type, and deprecating the procedure. Export the
field accessors so that the <upower-configuration> record type becomes more
usable.
* gnu/services/desktop.scm (<upower-configuration>): Export it.
(upower-configuration-upower, upower-configuration-watts-up-pro?,
upower-configuration-poll-batteries?, upower-configuration-ignore-lid?,
upower-configuration-use-percentage-for-policy?,
upower-configuration-percentage-low, upower-configuration-percentage-critical,
upower-configuration-percentage-action, upower-configuration-time-low,
upower-configuration-time-critical, upower-configuration-time-action,
upower-configuration-critical-power-action): Add default and export.
2019-01-29 09:49:01 -05:00
|
|
|
|
;;; Copyright © 2017, 2019 Christopher Baines <mail@cbaines.net>
|
2019-01-05 17:28:18 -05:00
|
|
|
|
;;; Copyright © 2019 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
|
2019-10-15 08:17:54 -04:00
|
|
|
|
;;; Copyright © 2019 David Wilson <david@daviwil.com>
|
2024-08-17 20:00:00 -04:00
|
|
|
|
;;; Copyright © 2020, 2024 Tobias Geerinckx-Rice <me@tobias.gr>
|
2020-10-19 16:58:49 -04:00
|
|
|
|
;;; Copyright © 2020 Reza Alizadeh Majd <r.majd@pantherx.org>
|
2021-07-06 16:03:20 -04:00
|
|
|
|
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
|
2022-07-22 00:09:54 -04:00
|
|
|
|
;;; Copyright © 2021, 2022 muradm <mail@muradm.net>
|
2023-03-06 07:35:01 -05:00
|
|
|
|
;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
|
2017-07-31 07:04:22 -04:00
|
|
|
|
;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
|
2015-05-01 13:36:10 -04:00
|
|
|
|
;;;
|
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
|
;;; your option) any later version.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
|
;;;
|
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
(define-module (gnu services desktop)
|
|
|
|
|
#:use-module (gnu services)
|
2016-01-27 07:45:01 -05:00
|
|
|
|
#:use-module (gnu services shepherd)
|
2015-05-08 09:58:59 -04:00
|
|
|
|
#:use-module (gnu services base)
|
2024-01-25 10:35:17 -05:00
|
|
|
|
#:use-module (gnu services configuration)
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
#:use-module (gnu services dbus)
|
2015-05-08 09:58:59 -04:00
|
|
|
|
#:use-module (gnu services avahi)
|
|
|
|
|
#:use-module (gnu services xorg)
|
|
|
|
|
#:use-module (gnu services networking)
|
2018-05-02 08:01:37 -04:00
|
|
|
|
#:use-module (gnu services sound)
|
2016-09-01 08:00:39 -04:00
|
|
|
|
#:use-module ((gnu system file-systems)
|
2022-06-15 05:17:41 -04:00
|
|
|
|
#:select (%control-groups
|
|
|
|
|
%elogind-file-systems
|
|
|
|
|
file-system))
|
2021-12-08 09:41:00 -05:00
|
|
|
|
#:autoload (gnu services sddm) (sddm-service-type)
|
2018-03-10 15:24:00 -05:00
|
|
|
|
#:use-module (gnu system)
|
2024-08-17 20:00:00 -04:00
|
|
|
|
#:use-module (gnu system privilege)
|
2015-05-01 13:36:10 -04:00
|
|
|
|
#:use-module (gnu system shadow)
|
2021-12-19 11:41:46 -05:00
|
|
|
|
#:use-module (gnu system uuid)
|
2015-11-03 12:08:47 -05:00
|
|
|
|
#:use-module (gnu system pam)
|
2015-05-01 13:36:10 -04:00
|
|
|
|
#:use-module (gnu packages glib)
|
|
|
|
|
#:use-module (gnu packages admin)
|
2019-01-29 05:03:12 -05:00
|
|
|
|
#:use-module (gnu packages cups)
|
2015-08-18 05:56:17 -04:00
|
|
|
|
#:use-module (gnu packages freedesktop)
|
2015-05-01 13:36:10 -04:00
|
|
|
|
#:use-module (gnu packages gnome)
|
2017-07-31 07:04:22 -04:00
|
|
|
|
#:use-module (gnu packages kde)
|
|
|
|
|
#:use-module (gnu packages kde-frameworks)
|
|
|
|
|
#:use-module (gnu packages kde-plasma)
|
2024-01-25 10:35:17 -05:00
|
|
|
|
#:use-module (gnu packages pulseaudio)
|
2016-02-24 17:08:58 -05:00
|
|
|
|
#:use-module (gnu packages xfce)
|
2015-05-08 09:58:59 -04:00
|
|
|
|
#:use-module (gnu packages avahi)
|
2015-10-29 14:00:14 -04:00
|
|
|
|
#:use-module (gnu packages xdisorg)
|
2020-01-05 07:51:02 -05:00
|
|
|
|
#:use-module (gnu packages scanner)
|
2015-10-29 14:00:14 -04:00
|
|
|
|
#:use-module (gnu packages suckless)
|
2023-02-28 12:11:08 -05:00
|
|
|
|
#:use-module (gnu packages sugar)
|
2016-06-15 11:14:01 -04:00
|
|
|
|
#:use-module (gnu packages linux)
|
2016-12-29 17:20:57 -05:00
|
|
|
|
#:use-module (gnu packages libusb)
|
2020-10-19 16:58:49 -04:00
|
|
|
|
#:use-module (gnu packages lxqt)
|
2017-12-30 16:52:54 -05:00
|
|
|
|
#:use-module (gnu packages mate)
|
2020-09-24 15:30:18 -04:00
|
|
|
|
#:use-module (gnu packages nfs)
|
2018-03-10 15:24:00 -05:00
|
|
|
|
#:use-module (gnu packages enlightenment)
|
2019-01-29 10:17:11 -05:00
|
|
|
|
#:use-module (guix deprecation)
|
2015-08-18 05:56:17 -04:00
|
|
|
|
#:use-module (guix records)
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
#:use-module (guix packages)
|
2015-05-01 13:36:10 -04:00
|
|
|
|
#:use-module (guix store)
|
2022-07-22 00:09:54 -04:00
|
|
|
|
#:use-module (guix ui)
|
2018-03-10 15:24:00 -05:00
|
|
|
|
#:use-module (guix utils)
|
2015-05-01 13:36:10 -04:00
|
|
|
|
#:use-module (guix gexp)
|
2024-02-05 12:05:41 -05:00
|
|
|
|
#:use-module (guix modules)
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
#:use-module (srfi srfi-1)
|
2023-02-17 09:16:17 -05:00
|
|
|
|
#:use-module (srfi srfi-26)
|
2021-12-19 11:41:46 -05:00
|
|
|
|
#:use-module (ice-9 format)
|
2015-05-01 13:36:10 -04:00
|
|
|
|
#:use-module (ice-9 match)
|
services: Improve the upower-configuration record.
Copy the defaults from the upower-service procedure to the
<upower-configuration> record type. This will allow making it the default
value for the upower-service-type, and deprecating the procedure. Export the
field accessors so that the <upower-configuration> record type becomes more
usable.
* gnu/services/desktop.scm (<upower-configuration>): Export it.
(upower-configuration-upower, upower-configuration-watts-up-pro?,
upower-configuration-poll-batteries?, upower-configuration-ignore-lid?,
upower-configuration-use-percentage-for-policy?,
upower-configuration-percentage-low, upower-configuration-percentage-critical,
upower-configuration-percentage-action, upower-configuration-time-low,
upower-configuration-time-critical, upower-configuration-time-action,
upower-configuration-critical-power-action): Add default and export.
2019-01-29 09:49:01 -05:00
|
|
|
|
#:export (<upower-configuration>
|
|
|
|
|
upower-configuration
|
2016-07-19 09:19:14 -04:00
|
|
|
|
upower-configuration?
|
services: Improve the upower-configuration record.
Copy the defaults from the upower-service procedure to the
<upower-configuration> record type. This will allow making it the default
value for the upower-service-type, and deprecating the procedure. Export the
field accessors so that the <upower-configuration> record type becomes more
usable.
* gnu/services/desktop.scm (<upower-configuration>): Export it.
(upower-configuration-upower, upower-configuration-watts-up-pro?,
upower-configuration-poll-batteries?, upower-configuration-ignore-lid?,
upower-configuration-use-percentage-for-policy?,
upower-configuration-percentage-low, upower-configuration-percentage-critical,
upower-configuration-percentage-action, upower-configuration-time-low,
upower-configuration-time-critical, upower-configuration-time-action,
upower-configuration-critical-power-action): Add default and export.
2019-01-29 09:49:01 -05:00
|
|
|
|
upower-configuration-upower
|
|
|
|
|
upower-configuration-watts-up-pro?
|
|
|
|
|
upower-configuration-poll-batteries?
|
|
|
|
|
upower-configuration-ignore-lid?
|
|
|
|
|
upower-configuration-use-percentage-for-policy?
|
|
|
|
|
upower-configuration-percentage-low
|
|
|
|
|
upower-configuration-percentage-critical
|
|
|
|
|
upower-configuration-percentage-action
|
|
|
|
|
upower-configuration-time-low
|
|
|
|
|
upower-configuration-time-critical
|
|
|
|
|
upower-configuration-time-action
|
|
|
|
|
upower-configuration-critical-power-action
|
|
|
|
|
|
2016-07-19 09:19:14 -04:00
|
|
|
|
upower-service-type
|
|
|
|
|
|
|
|
|
|
udisks-configuration
|
|
|
|
|
udisks-configuration?
|
2023-02-25 13:58:05 -05:00
|
|
|
|
udisks-service ; deprecated
|
2016-07-19 09:19:14 -04:00
|
|
|
|
udisks-service-type
|
|
|
|
|
|
2024-04-22 08:42:13 -04:00
|
|
|
|
gvfs-configuration
|
|
|
|
|
gvfs-configuration?
|
|
|
|
|
gvfs-service-type
|
|
|
|
|
|
2019-04-30 06:02:29 -04:00
|
|
|
|
colord-service-type
|
2016-07-19 09:19:14 -04:00
|
|
|
|
|
2015-08-15 15:36:22 -04:00
|
|
|
|
geoclue-application
|
2016-07-19 09:19:14 -04:00
|
|
|
|
geoclue-configuration
|
|
|
|
|
geoclue-configuration?
|
2015-08-15 15:36:22 -04:00
|
|
|
|
%standard-geoclue-applications
|
2023-02-25 13:58:06 -05:00
|
|
|
|
geoclue-service ; deprecated
|
2016-07-19 09:19:14 -04:00
|
|
|
|
geoclue-service-type
|
|
|
|
|
|
2019-04-30 05:59:47 -04:00
|
|
|
|
bluetooth-service-type
|
|
|
|
|
bluetooth-configuration
|
|
|
|
|
bluetooth-configuration?
|
2023-02-25 13:58:07 -05:00
|
|
|
|
bluetooth-service ; deprecated
|
2016-07-19 09:19:14 -04:00
|
|
|
|
|
2015-08-18 05:56:17 -04:00
|
|
|
|
elogind-configuration
|
2016-07-19 09:19:14 -04:00
|
|
|
|
elogind-configuration?
|
2023-02-25 13:58:01 -05:00
|
|
|
|
elogind-service ; deprecated
|
2016-07-19 09:19:14 -04:00
|
|
|
|
elogind-service-type
|
|
|
|
|
|
2022-09-16 14:45:15 -04:00
|
|
|
|
%gdm-file-system
|
|
|
|
|
gdm-file-system-service
|
|
|
|
|
|
2020-03-18 06:38:15 -04:00
|
|
|
|
%fontconfig-file-system
|
|
|
|
|
fontconfig-file-system-service
|
|
|
|
|
|
2017-08-22 08:20:48 -04:00
|
|
|
|
accountsservice-service-type
|
2023-02-25 13:58:03 -05:00
|
|
|
|
accountsservice-service ; deprecated
|
2017-08-22 08:20:48 -04:00
|
|
|
|
|
2019-04-26 12:07:46 -04:00
|
|
|
|
cups-pk-helper-service-type
|
2020-01-21 08:26:41 -05:00
|
|
|
|
sane-service-type
|
2019-04-26 12:07:46 -04:00
|
|
|
|
|
2016-07-19 09:19:14 -04:00
|
|
|
|
gnome-desktop-configuration
|
|
|
|
|
gnome-desktop-configuration?
|
2024-01-25 10:35:17 -05:00
|
|
|
|
gnome-desktop-configuration-core-services
|
|
|
|
|
gnome-desktop-configuration-shell
|
|
|
|
|
gnome-desktop-configuration-utilities
|
|
|
|
|
gnome-desktop-configuration-extra-packages
|
2024-02-05 12:05:41 -05:00
|
|
|
|
gnome-desktop-configuration-udev-ignorelist
|
2016-02-24 17:08:58 -05:00
|
|
|
|
gnome-desktop-service
|
2016-07-19 09:19:14 -04:00
|
|
|
|
gnome-desktop-service-type
|
|
|
|
|
|
2017-12-30 16:52:54 -05:00
|
|
|
|
mate-desktop-configuration
|
|
|
|
|
mate-desktop-configuration?
|
|
|
|
|
mate-desktop-service
|
|
|
|
|
mate-desktop-service-type
|
|
|
|
|
|
2020-10-19 16:58:49 -04:00
|
|
|
|
lxqt-desktop-configuration
|
|
|
|
|
lxqt-desktop-configuration?
|
|
|
|
|
lxqt-desktop-service-type
|
|
|
|
|
|
2023-02-28 12:11:08 -05:00
|
|
|
|
sugar-desktop-configuration
|
|
|
|
|
sugar-desktop-configuration?
|
|
|
|
|
sugar-desktop-service-type
|
|
|
|
|
|
2017-07-31 07:04:22 -04:00
|
|
|
|
plasma-desktop-configuration
|
|
|
|
|
plasma-desktop-configuration?
|
|
|
|
|
plasma-desktop-service-type
|
|
|
|
|
|
2016-07-19 09:19:14 -04:00
|
|
|
|
xfce-desktop-configuration
|
|
|
|
|
xfce-desktop-configuration?
|
2016-02-24 17:08:58 -05:00
|
|
|
|
xfce-desktop-service
|
2016-07-19 09:19:14 -04:00
|
|
|
|
xfce-desktop-service-type
|
|
|
|
|
|
2023-03-06 07:35:01 -05:00
|
|
|
|
x11-socket-directory-service ;deprecated
|
|
|
|
|
x11-socket-directory-service-type
|
2018-03-31 08:34:50 -04:00
|
|
|
|
|
2018-03-10 15:24:00 -05:00
|
|
|
|
enlightenment-desktop-configuration
|
|
|
|
|
enlightenment-desktop-configuration?
|
|
|
|
|
enlightenment-desktop-service-type
|
|
|
|
|
|
2019-01-05 17:28:18 -05:00
|
|
|
|
inputattach-configuration
|
|
|
|
|
inputattach-configuration?
|
|
|
|
|
inputattach-service-type
|
|
|
|
|
|
2019-11-23 13:51:15 -05:00
|
|
|
|
polkit-wheel-service
|
|
|
|
|
|
2019-11-09 10:14:45 -05:00
|
|
|
|
gnome-keyring-configuration
|
|
|
|
|
gnome-keyring-configuration?
|
|
|
|
|
gnome-keyring-service-type
|
|
|
|
|
|
2022-06-15 05:17:41 -04:00
|
|
|
|
seatd-configuration
|
|
|
|
|
seatd-service-type
|
|
|
|
|
|
2015-05-08 09:58:59 -04:00
|
|
|
|
%desktop-services))
|
2015-05-01 13:36:10 -04:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
;;;
|
|
|
|
|
;;; This module contains service definitions for a "desktop" environment.
|
|
|
|
|
;;;
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
2015-08-15 15:36:22 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Helpers.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define (bool value)
|
|
|
|
|
(if value "true\n" "false\n"))
|
|
|
|
|
|
2023-02-16 12:21:39 -05:00
|
|
|
|
(define (package-direct-input-selector tree)
|
|
|
|
|
"Return a procedure that selects TREE from the inputs of PACKAGE. If TREE
|
|
|
|
|
is a list, it recursively searches it until it locates the last item of TREE."
|
2016-02-24 17:08:58 -05:00
|
|
|
|
(lambda (package)
|
2023-02-16 12:21:39 -05:00
|
|
|
|
(let loop ((tree (if (pair? tree)
|
|
|
|
|
tree
|
|
|
|
|
(list tree)))
|
|
|
|
|
(package package))
|
|
|
|
|
(if (null? tree)
|
|
|
|
|
package
|
|
|
|
|
(loop (cdr tree)
|
|
|
|
|
(car (assoc-ref (package-direct-inputs package)
|
|
|
|
|
(car tree))))))))
|
2015-05-01 13:36:10 -04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Upower D-Bus service.
|
|
|
|
|
;;;
|
|
|
|
|
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
(define-record-type* <upower-configuration>
|
|
|
|
|
upower-configuration make-upower-configuration
|
|
|
|
|
upower-configuration?
|
services: Improve the upower-configuration record.
Copy the defaults from the upower-service procedure to the
<upower-configuration> record type. This will allow making it the default
value for the upower-service-type, and deprecating the procedure. Export the
field accessors so that the <upower-configuration> record type becomes more
usable.
* gnu/services/desktop.scm (<upower-configuration>): Export it.
(upower-configuration-upower, upower-configuration-watts-up-pro?,
upower-configuration-poll-batteries?, upower-configuration-ignore-lid?,
upower-configuration-use-percentage-for-policy?,
upower-configuration-percentage-low, upower-configuration-percentage-critical,
upower-configuration-percentage-action, upower-configuration-time-low,
upower-configuration-time-critical, upower-configuration-time-action,
upower-configuration-critical-power-action): Add default and export.
2019-01-29 09:49:01 -05:00
|
|
|
|
(upower upower-configuration-upower
|
|
|
|
|
(default upower))
|
|
|
|
|
(watts-up-pro? upower-configuration-watts-up-pro?
|
|
|
|
|
(default #f))
|
|
|
|
|
(poll-batteries? upower-configuration-poll-batteries?
|
|
|
|
|
(default #t))
|
|
|
|
|
(ignore-lid? upower-configuration-ignore-lid?
|
|
|
|
|
(default #f))
|
|
|
|
|
(use-percentage-for-policy? upower-configuration-use-percentage-for-policy?
|
2022-09-02 17:48:37 -04:00
|
|
|
|
(default #t))
|
services: Improve the upower-configuration record.
Copy the defaults from the upower-service procedure to the
<upower-configuration> record type. This will allow making it the default
value for the upower-service-type, and deprecating the procedure. Export the
field accessors so that the <upower-configuration> record type becomes more
usable.
* gnu/services/desktop.scm (<upower-configuration>): Export it.
(upower-configuration-upower, upower-configuration-watts-up-pro?,
upower-configuration-poll-batteries?, upower-configuration-ignore-lid?,
upower-configuration-use-percentage-for-policy?,
upower-configuration-percentage-low, upower-configuration-percentage-critical,
upower-configuration-percentage-action, upower-configuration-time-low,
upower-configuration-time-critical, upower-configuration-time-action,
upower-configuration-critical-power-action): Add default and export.
2019-01-29 09:49:01 -05:00
|
|
|
|
(percentage-low upower-configuration-percentage-low
|
2022-09-02 17:46:22 -04:00
|
|
|
|
(default 20))
|
services: Improve the upower-configuration record.
Copy the defaults from the upower-service procedure to the
<upower-configuration> record type. This will allow making it the default
value for the upower-service-type, and deprecating the procedure. Export the
field accessors so that the <upower-configuration> record type becomes more
usable.
* gnu/services/desktop.scm (<upower-configuration>): Export it.
(upower-configuration-upower, upower-configuration-watts-up-pro?,
upower-configuration-poll-batteries?, upower-configuration-ignore-lid?,
upower-configuration-use-percentage-for-policy?,
upower-configuration-percentage-low, upower-configuration-percentage-critical,
upower-configuration-percentage-action, upower-configuration-time-low,
upower-configuration-time-critical, upower-configuration-time-action,
upower-configuration-critical-power-action): Add default and export.
2019-01-29 09:49:01 -05:00
|
|
|
|
(percentage-critical upower-configuration-percentage-critical
|
2022-09-02 17:46:22 -04:00
|
|
|
|
(default 5))
|
services: Improve the upower-configuration record.
Copy the defaults from the upower-service procedure to the
<upower-configuration> record type. This will allow making it the default
value for the upower-service-type, and deprecating the procedure. Export the
field accessors so that the <upower-configuration> record type becomes more
usable.
* gnu/services/desktop.scm (<upower-configuration>): Export it.
(upower-configuration-upower, upower-configuration-watts-up-pro?,
upower-configuration-poll-batteries?, upower-configuration-ignore-lid?,
upower-configuration-use-percentage-for-policy?,
upower-configuration-percentage-low, upower-configuration-percentage-critical,
upower-configuration-percentage-action, upower-configuration-time-low,
upower-configuration-time-critical, upower-configuration-time-action,
upower-configuration-critical-power-action): Add default and export.
2019-01-29 09:49:01 -05:00
|
|
|
|
(percentage-action upower-configuration-percentage-action
|
|
|
|
|
(default 2))
|
|
|
|
|
(time-low upower-configuration-time-low
|
|
|
|
|
(default 1200))
|
|
|
|
|
(time-critical upower-configuration-time-critical
|
|
|
|
|
(default 300))
|
|
|
|
|
(time-action upower-configuration-time-action
|
|
|
|
|
(default 120))
|
|
|
|
|
(critical-power-action upower-configuration-critical-power-action
|
|
|
|
|
(default 'hybrid-sleep)))
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
|
|
|
|
|
(define* upower-configuration-file
|
|
|
|
|
;; Return an upower-daemon configuration file.
|
|
|
|
|
(match-lambda
|
|
|
|
|
(($ <upower-configuration> upower
|
|
|
|
|
watts-up-pro? poll-batteries? ignore-lid? use-percentage-for-policy?
|
|
|
|
|
percentage-low percentage-critical percentage-action time-low
|
|
|
|
|
time-critical time-action critical-power-action)
|
|
|
|
|
(plain-file "UPower.conf"
|
|
|
|
|
(string-append
|
|
|
|
|
"[UPower]\n"
|
|
|
|
|
"EnableWattsUpPro=" (bool watts-up-pro?)
|
|
|
|
|
"NoPollBatteries=" (bool (not poll-batteries?))
|
|
|
|
|
"IgnoreLid=" (bool ignore-lid?)
|
|
|
|
|
"UsePercentageForPolicy=" (bool use-percentage-for-policy?)
|
|
|
|
|
"PercentageLow=" (number->string percentage-low) "\n"
|
|
|
|
|
"PercentageCritical=" (number->string percentage-critical) "\n"
|
|
|
|
|
"PercentageAction=" (number->string percentage-action) "\n"
|
|
|
|
|
"TimeLow=" (number->string time-low) "\n"
|
|
|
|
|
"TimeCritical=" (number->string time-critical) "\n"
|
|
|
|
|
"TimeAction=" (number->string time-action) "\n"
|
|
|
|
|
"CriticalPowerAction=" (match critical-power-action
|
|
|
|
|
('hybrid-sleep "HybridSleep")
|
|
|
|
|
('hibernate "Hibernate")
|
|
|
|
|
('power-off "PowerOff"))
|
|
|
|
|
"\n")))))
|
|
|
|
|
|
|
|
|
|
(define %upower-activation
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils))
|
2015-10-11 16:16:50 -04:00
|
|
|
|
(mkdir-p "/var/lib/upower")))
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
|
|
|
|
|
(define (upower-dbus-service config)
|
|
|
|
|
(list (wrapped-dbus-service (upower-configuration-upower config)
|
|
|
|
|
"libexec/upowerd"
|
2019-04-02 16:35:49 -04:00
|
|
|
|
`(("UPOWER_CONF_FILE_NAME"
|
|
|
|
|
,(upower-configuration-file config))))))
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
|
services: Rename 'dmd' services to 'shepherd'.
* gnu/services/shepherd.scm (dmd-root-service-type, %dmd-root-service)
(dmd-service-type, <dmd-service>, dmd-service, dmd-service?)
(make-dmd-service, dmd-service-documentation, dmd-service-provision)
(dmd-service-requirement, dmd-service-respawn, dmd-service-start)
(dmd-service-stop, dmd-service-auto-start?, dmd-service-modules)
(dmd-service-imported-modules, dmd-service-file-name, dmd-service-file)
(dmd-service-back-edges): Rename to...
(shepherd-root-service-type, %shepherd-root-service, shepherd-service-type)
(<shepherd-service>, shepherd-service, shepherd-service?)
(make-shepherd-service, shepherd-service-documentation)
(shepherd-service-provision, shepherd-service-requirement)
(shepherd-service-respawn, shepherd-service-start)
(shepherd-service-stop, shepherd-service-auto-start?)
(shepherd-service-modules, shepherd-service-imported-modules)
(shepherd-service-file-name, shepherd-service-file)
(shepherd-service-back-edges): ...this
* gnu/services.scm: Adjust comments.
* gnu/services/avahi.scm (avahi-dmd-service): Rename to...
(avahi-shepherd-service): ... this.
* gnu/services/base.scm (%root-file-system-dmd-service)
(file-system->dmd-service-name, mapped-device->dmd-service-name)
(dependency->dmd-service-name, file-system-dmd-service)
(mingetty-dmd-service, nscd-dmd-service, guix-dmd-service)
(guix-publish-dmd-service, udev-dmd-service, gpm-dmd-service): Rename to...
(%root-file-system-shepherd-service)
(file-system->shepherd-service-name, mapped-device->shepherd-service-name)
(dependency->shepherd-service-name, file-system-shepherd-service)
(mingetty-shepherd-service, nscd-shepherd-service, guix-shepherd-service)
(guix-publish-shepherd-service, udev-shepherd-service)
(gpm-shepherd-service): ... this.
* gnu/services/databases.scm (postgresql-dmd-service): Rename to...
(postgresql-shepherd-service): ... this.
* gnu/services/desktop.scm (upower-dmd-service, elogind-dmd-service):
Rename to...
(upower-shepherd-service, elogind-shepherd-service): ... this.
* gnu/services/dbus.scm (dbus-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/lirc.scm (lirc-dmd-service): Rename to...
(lirc-shepherd-service): ... this.
* gnu/services/mail.scm (dovecot-dmd-service): Rename to...
(dovecot-shepherd-service): ... this.
* gnu/services/networking.scm (ntp-dmd-service, tor-dmd-service)
(bitlbee-dmd-service, wicd-dmd-service, network-manager-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/ssh.scm (lsh-dmd-service): Rename to...
(lsh-shepherd-service): ... this.
* gnu/services/web.scm (nginx-dmd-service): Rename to...
(nginx-shepherd-service): ... this.
* gnu/services/xorg.scm (slim-dmd-service): Rename to...
(slim-shepherd-service): ... this.
* gnu/system.scm (essential-services): Use '%shepherd-root-service'.
* gnu/system/install.scm (cow-store-service-type): Adjust accordingly.
* guix/scripts/system.scm (dmd-service-node-label, dmd-service-node-type)
(export-dmd-graph): Likewise.
* tests/guix-system.sh: Likewise.
* tests/services.scm ("dmd-service-back-edges"): Rename to...
("shepherd-service-back-edges"): Adjust accordingly.
* doc/guix.texi: Likewise.
* doc/images/service-graph.dot: Use 'shepherd' service name.
2016-01-27 15:02:31 -05:00
|
|
|
|
(define (upower-shepherd-service config)
|
|
|
|
|
"Return a shepherd service for UPower with CONFIG."
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
(let ((upower (upower-configuration-upower config))
|
|
|
|
|
(config (upower-configuration-file config)))
|
services: Rename 'dmd' services to 'shepherd'.
* gnu/services/shepherd.scm (dmd-root-service-type, %dmd-root-service)
(dmd-service-type, <dmd-service>, dmd-service, dmd-service?)
(make-dmd-service, dmd-service-documentation, dmd-service-provision)
(dmd-service-requirement, dmd-service-respawn, dmd-service-start)
(dmd-service-stop, dmd-service-auto-start?, dmd-service-modules)
(dmd-service-imported-modules, dmd-service-file-name, dmd-service-file)
(dmd-service-back-edges): Rename to...
(shepherd-root-service-type, %shepherd-root-service, shepherd-service-type)
(<shepherd-service>, shepherd-service, shepherd-service?)
(make-shepherd-service, shepherd-service-documentation)
(shepherd-service-provision, shepherd-service-requirement)
(shepherd-service-respawn, shepherd-service-start)
(shepherd-service-stop, shepherd-service-auto-start?)
(shepherd-service-modules, shepherd-service-imported-modules)
(shepherd-service-file-name, shepherd-service-file)
(shepherd-service-back-edges): ...this
* gnu/services.scm: Adjust comments.
* gnu/services/avahi.scm (avahi-dmd-service): Rename to...
(avahi-shepherd-service): ... this.
* gnu/services/base.scm (%root-file-system-dmd-service)
(file-system->dmd-service-name, mapped-device->dmd-service-name)
(dependency->dmd-service-name, file-system-dmd-service)
(mingetty-dmd-service, nscd-dmd-service, guix-dmd-service)
(guix-publish-dmd-service, udev-dmd-service, gpm-dmd-service): Rename to...
(%root-file-system-shepherd-service)
(file-system->shepherd-service-name, mapped-device->shepherd-service-name)
(dependency->shepherd-service-name, file-system-shepherd-service)
(mingetty-shepherd-service, nscd-shepherd-service, guix-shepherd-service)
(guix-publish-shepherd-service, udev-shepherd-service)
(gpm-shepherd-service): ... this.
* gnu/services/databases.scm (postgresql-dmd-service): Rename to...
(postgresql-shepherd-service): ... this.
* gnu/services/desktop.scm (upower-dmd-service, elogind-dmd-service):
Rename to...
(upower-shepherd-service, elogind-shepherd-service): ... this.
* gnu/services/dbus.scm (dbus-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/lirc.scm (lirc-dmd-service): Rename to...
(lirc-shepherd-service): ... this.
* gnu/services/mail.scm (dovecot-dmd-service): Rename to...
(dovecot-shepherd-service): ... this.
* gnu/services/networking.scm (ntp-dmd-service, tor-dmd-service)
(bitlbee-dmd-service, wicd-dmd-service, network-manager-dmd-service): Rename to...
(dbus-shepherd-service): ... this.
* gnu/services/ssh.scm (lsh-dmd-service): Rename to...
(lsh-shepherd-service): ... this.
* gnu/services/web.scm (nginx-dmd-service): Rename to...
(nginx-shepherd-service): ... this.
* gnu/services/xorg.scm (slim-dmd-service): Rename to...
(slim-shepherd-service): ... this.
* gnu/system.scm (essential-services): Use '%shepherd-root-service'.
* gnu/system/install.scm (cow-store-service-type): Adjust accordingly.
* guix/scripts/system.scm (dmd-service-node-label, dmd-service-node-type)
(export-dmd-graph): Likewise.
* tests/guix-system.sh: Likewise.
* tests/services.scm ("dmd-service-back-edges"): Rename to...
("shepherd-service-back-edges"): Adjust accordingly.
* doc/guix.texi: Likewise.
* doc/images/service-graph.dot: Use 'shepherd' service name.
2016-01-27 15:02:31 -05:00
|
|
|
|
(list (shepherd-service
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
(documentation "Run the UPower power and battery monitor.")
|
|
|
|
|
(provision '(upower-daemon))
|
|
|
|
|
(requirement '(dbus-system udev))
|
|
|
|
|
|
|
|
|
|
(start #~(make-forkexec-constructor
|
|
|
|
|
(list (string-append #$upower "/libexec/upowerd"))
|
|
|
|
|
#:environment-variables
|
|
|
|
|
(list (string-append "UPOWER_CONF_FILE_NAME="
|
|
|
|
|
#$config))))
|
2022-11-11 12:56:35 -05:00
|
|
|
|
(stop #~(make-kill-destructor))
|
|
|
|
|
(actions (list (shepherd-configuration-action config)))))))
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
|
|
|
|
|
(define upower-service-type
|
2016-02-05 10:48:39 -05:00
|
|
|
|
(let ((upower-package (compose list upower-configuration-upower)))
|
|
|
|
|
(service-type (name 'upower)
|
2019-01-29 10:14:15 -05:00
|
|
|
|
(description
|
2024-09-09 10:45:37 -04:00
|
|
|
|
"Run @command{upowerd}, a system-wide monitor for power
|
2019-01-29 10:14:15 -05:00
|
|
|
|
consumption and battery levels, with the given configuration settings. It
|
|
|
|
|
implements the @code{org.freedesktop.UPower} D-Bus interface, and is notably
|
|
|
|
|
used by GNOME.")
|
2016-02-05 10:48:39 -05:00
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension dbus-root-service-type
|
|
|
|
|
upower-dbus-service)
|
|
|
|
|
(service-extension shepherd-root-service-type
|
|
|
|
|
upower-shepherd-service)
|
|
|
|
|
(service-extension activation-service-type
|
|
|
|
|
(const %upower-activation))
|
|
|
|
|
(service-extension udev-service-type
|
|
|
|
|
upower-package)
|
|
|
|
|
|
|
|
|
|
;; Make the 'upower' command visible.
|
|
|
|
|
(service-extension profile-service-type
|
2019-01-29 10:14:15 -05:00
|
|
|
|
upower-package)))
|
|
|
|
|
(default-value (upower-configuration)))))
|
2015-05-01 13:36:10 -04:00
|
|
|
|
|
2015-08-15 15:36:22 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; GeoClue D-Bus service.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define* (geoclue-application name #:key (allowed? #t) system? (users '()))
|
|
|
|
|
"Configure default GeoClue access permissions for an application. NAME is
|
|
|
|
|
the Desktop ID of the application, without the .desktop part. If ALLOWED? is
|
|
|
|
|
true, the application will have access to location information by default.
|
|
|
|
|
The boolean SYSTEM? value indicates that an application is a system component
|
|
|
|
|
or not. Finally USERS is a list of UIDs of all users for which this
|
|
|
|
|
application is allowed location info access. An empty users list means all
|
|
|
|
|
users are allowed."
|
|
|
|
|
(string-append
|
|
|
|
|
"[" name "]\n"
|
|
|
|
|
"allowed=" (bool allowed?)
|
|
|
|
|
"system=" (bool system?)
|
|
|
|
|
"users=" (string-join users ";") "\n"))
|
|
|
|
|
|
|
|
|
|
(define %standard-geoclue-applications
|
|
|
|
|
(list (geoclue-application "gnome-datetime-panel" #:system? #t)
|
|
|
|
|
(geoclue-application "epiphany" #:system? #f)
|
|
|
|
|
(geoclue-application "firefox" #:system? #f)))
|
|
|
|
|
|
2023-02-25 13:58:06 -05:00
|
|
|
|
;; TODO: Use define-configuration and export accessors.
|
|
|
|
|
(define-record-type* <geoclue-configuration>
|
|
|
|
|
geoclue-configuration make-geoclue-configuration
|
|
|
|
|
geoclue-configuration?
|
|
|
|
|
(geoclue geoclue-configuration-geoclue
|
|
|
|
|
(default geoclue))
|
|
|
|
|
(whitelist geoclue-configuration-whitelist
|
|
|
|
|
(default '()))
|
|
|
|
|
(wifi-geolocation-url
|
|
|
|
|
geoclue-configuration-wifi-geolocation-url
|
|
|
|
|
;; Mozilla geolocation service:
|
|
|
|
|
(default "https://location.services.mozilla.com/v1/geolocate?key=geoclue"))
|
|
|
|
|
(submit-data? geoclue-configuration-submit-data?
|
|
|
|
|
(default #f))
|
|
|
|
|
(wifi-submission-url
|
|
|
|
|
geoclue-configuration-wifi-submission-url
|
|
|
|
|
(default "https://location.services.mozilla.com/v1/submit?key=geoclue"))
|
|
|
|
|
(submission-nick geoclue-configuration-submission-nick
|
|
|
|
|
(default "geoclue"))
|
|
|
|
|
(applications geoclue-configuration-applications
|
|
|
|
|
(default %standard-geoclue-applications)))
|
|
|
|
|
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
(define* (geoclue-configuration-file config)
|
2015-08-15 15:36:22 -04:00
|
|
|
|
"Return a geoclue configuration file."
|
system: Make service procedures non-monadic.
* gnu/services/avahi.scm (configuration-file): Use 'plain-file' instead
of 'text-file'.
(avahi-service): Turn into a regular procedure that returns a <service>.
* gnu/services/base.scm (root-file-system-service, file-system-service,
user-unmount-service, user-processes-service, host-name-service,
console-keymap-service, console-font-service, mingetty-service,
nscd.conf-file, nscd-service): Likewise.
(%default-syslog.conf): New variable.
(syslog-service): Use it. Turn into a regular procedure.
(guix-service, udev-rules-union, kvm-udev-rule, udev-service,
device-mapping-service, swap-service): Likewise.
* gnu/services/databases.scm (%default-postgres-hba,
%default-postgres-ident): Use 'plain-file' instead of 'text-file'.
(%default-postgres-config): Use 'mixed-text-file' instead of
'text-file*'.
(postgresql-service): Use 'program-file' instead of 'gexp->script'.
Turn into a regular procedure.
* gnu/services/desktop.scm (dbus-configuration-directory): Use
'computed-file' instead of 'gexp->derivation'.
(upower-configuration-file, geoclue-configuration-file,
elogind-configuration-file): Use 'plain-file' instead of 'text-file'.
(dbus-service, upower-service, colord-service, geoclue-service,
polkit-service, elogind-service): Turn into regular procedures.
(%desktop-services): Remove use of 'mlet' when iterating on
%BASE-SERVICES.
* gnu/services/lirc.scm (lirc-service): Turn into a regular procedure.
* gnu/services/networking.scm (static-networking-service,
dhcp-client-service, ntp-service, tor-service, bitlbee-service,
wicd-service): Likewise.
* gnu/services/ssh.scm (lsh-service): Likewise.
* gnu/services/web.scm (nginx-service): Likewise.
* gnu/services/xorg.scm (xorg-configuration-file): Use 'mixed-text-file'
instead of 'text-file*'.
(xorg-start-command, slim-service): Turn into regular procedures.
(xinitrc): Use 'program-file' instead of 'gexp->script'.
* gnu/system/install.scm (cow-store-service,
configuration-template-service): Turn into regular procedures.
* gnu/system.scm (other-file-system-services, device-mapping-services,
swap-services, essential-services, operating-system-services,
user-shells, operating-system-accounts): Remove now unnecessary
'mlet' and turn into regular procedures.
(operating-system-etc-directory, operating-system-activation-script,
operating-system-boot-script): Adjust accordingly.
* doc/guix.texi (Base Services, Networking Services, X Window, Desktop
Services, Database Services, Web Services, Various Services, Name
Service Switch): Adjust accordingly.
2015-09-09 03:17:31 -04:00
|
|
|
|
(plain-file "geoclue.conf"
|
|
|
|
|
(string-append
|
|
|
|
|
"[agent]\n"
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
"whitelist="
|
|
|
|
|
(string-join (geoclue-configuration-whitelist config)
|
|
|
|
|
";") "\n"
|
system: Make service procedures non-monadic.
* gnu/services/avahi.scm (configuration-file): Use 'plain-file' instead
of 'text-file'.
(avahi-service): Turn into a regular procedure that returns a <service>.
* gnu/services/base.scm (root-file-system-service, file-system-service,
user-unmount-service, user-processes-service, host-name-service,
console-keymap-service, console-font-service, mingetty-service,
nscd.conf-file, nscd-service): Likewise.
(%default-syslog.conf): New variable.
(syslog-service): Use it. Turn into a regular procedure.
(guix-service, udev-rules-union, kvm-udev-rule, udev-service,
device-mapping-service, swap-service): Likewise.
* gnu/services/databases.scm (%default-postgres-hba,
%default-postgres-ident): Use 'plain-file' instead of 'text-file'.
(%default-postgres-config): Use 'mixed-text-file' instead of
'text-file*'.
(postgresql-service): Use 'program-file' instead of 'gexp->script'.
Turn into a regular procedure.
* gnu/services/desktop.scm (dbus-configuration-directory): Use
'computed-file' instead of 'gexp->derivation'.
(upower-configuration-file, geoclue-configuration-file,
elogind-configuration-file): Use 'plain-file' instead of 'text-file'.
(dbus-service, upower-service, colord-service, geoclue-service,
polkit-service, elogind-service): Turn into regular procedures.
(%desktop-services): Remove use of 'mlet' when iterating on
%BASE-SERVICES.
* gnu/services/lirc.scm (lirc-service): Turn into a regular procedure.
* gnu/services/networking.scm (static-networking-service,
dhcp-client-service, ntp-service, tor-service, bitlbee-service,
wicd-service): Likewise.
* gnu/services/ssh.scm (lsh-service): Likewise.
* gnu/services/web.scm (nginx-service): Likewise.
* gnu/services/xorg.scm (xorg-configuration-file): Use 'mixed-text-file'
instead of 'text-file*'.
(xorg-start-command, slim-service): Turn into regular procedures.
(xinitrc): Use 'program-file' instead of 'gexp->script'.
* gnu/system/install.scm (cow-store-service,
configuration-template-service): Turn into regular procedures.
* gnu/system.scm (other-file-system-services, device-mapping-services,
swap-services, essential-services, operating-system-services,
user-shells, operating-system-accounts): Remove now unnecessary
'mlet' and turn into regular procedures.
(operating-system-etc-directory, operating-system-activation-script,
operating-system-boot-script): Adjust accordingly.
* doc/guix.texi (Base Services, Networking Services, X Window, Desktop
Services, Database Services, Web Services, Various Services, Name
Service Switch): Adjust accordingly.
2015-09-09 03:17:31 -04:00
|
|
|
|
"[wifi]\n"
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
"url=" (geoclue-configuration-wifi-geolocation-url config) "\n"
|
|
|
|
|
"submit-data=" (bool (geoclue-configuration-submit-data? config))
|
|
|
|
|
"submission-url="
|
|
|
|
|
(geoclue-configuration-wifi-submission-url config) "\n"
|
|
|
|
|
"submission-nick="
|
|
|
|
|
(geoclue-configuration-submission-nick config)
|
|
|
|
|
"\n"
|
|
|
|
|
(string-join (geoclue-configuration-applications config)
|
|
|
|
|
"\n"))))
|
|
|
|
|
|
|
|
|
|
(define (geoclue-dbus-service config)
|
|
|
|
|
(list (wrapped-dbus-service (geoclue-configuration-geoclue config)
|
|
|
|
|
"libexec/geoclue"
|
2019-04-02 16:35:49 -04:00
|
|
|
|
`(("GEOCLUE_CONFIG_FILE"
|
|
|
|
|
,(geoclue-configuration-file config))))))
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
|
|
|
|
|
(define %geoclue-accounts
|
|
|
|
|
(list (user-group (name "geoclue") (system? #t))
|
|
|
|
|
(user-account
|
|
|
|
|
(name "geoclue")
|
|
|
|
|
(group "geoclue")
|
|
|
|
|
(system? #t)
|
|
|
|
|
(comment "GeoClue daemon user")
|
|
|
|
|
(home-directory "/var/empty")
|
|
|
|
|
(shell "/run/current-system/profile/sbin/nologin"))))
|
|
|
|
|
|
|
|
|
|
(define geoclue-service-type
|
|
|
|
|
(service-type (name 'geoclue)
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension dbus-root-service-type
|
|
|
|
|
geoclue-dbus-service)
|
|
|
|
|
(service-extension account-service-type
|
2022-04-29 06:24:20 -04:00
|
|
|
|
(const %geoclue-accounts))))
|
|
|
|
|
(description "Run the @command{geoclue} location service.
|
|
|
|
|
This service provides a D-Bus interface to allow applications to request
|
|
|
|
|
access to a user's physical location, and optionally to add information to
|
2023-03-03 14:34:39 -05:00
|
|
|
|
online location databases.")
|
|
|
|
|
(default-value (geoclue-configuration))))
|
2015-08-15 15:36:22 -04:00
|
|
|
|
|
2023-02-25 13:58:06 -05:00
|
|
|
|
(define-deprecated
|
|
|
|
|
(geoclue-service #:key (geoclue geoclue)
|
|
|
|
|
(whitelist '())
|
|
|
|
|
(wifi-geolocation-url
|
|
|
|
|
;; Mozilla geolocation service:
|
|
|
|
|
"https://location.services.mozilla.com/v1/geolocate?key=geoclue")
|
|
|
|
|
(submit-data? #f)
|
|
|
|
|
(wifi-submission-url
|
|
|
|
|
"https://location.services.mozilla.com/v1/submit?key=geoclue")
|
|
|
|
|
(submission-nick "geoclue")
|
|
|
|
|
(applications %standard-geoclue-applications))
|
|
|
|
|
geoclue-service-type
|
2015-08-15 15:36:22 -04:00
|
|
|
|
"Return a service that runs the @command{geoclue} location service. This
|
|
|
|
|
service provides a D-Bus interface to allow applications to request access to
|
|
|
|
|
a user's physical location, and optionally to add information to online
|
|
|
|
|
location databases. By default, only the GNOME date-time panel and the Icecat
|
|
|
|
|
and Epiphany web browsers are able to ask for the user's location, and in the
|
|
|
|
|
case of Icecat and Epiphany, both will ask the user for permission first. See
|
|
|
|
|
@uref{https://wiki.freedesktop.org/www/Software/GeoClue/, the geoclue web
|
|
|
|
|
site} for more information."
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
(service geoclue-service-type
|
|
|
|
|
(geoclue-configuration
|
|
|
|
|
(geoclue geoclue)
|
|
|
|
|
(whitelist whitelist)
|
|
|
|
|
(wifi-geolocation-url wifi-geolocation-url)
|
|
|
|
|
(submit-data? submit-data?)
|
|
|
|
|
(wifi-submission-url wifi-submission-url)
|
|
|
|
|
(submission-nick submission-nick)
|
|
|
|
|
(applications applications))))
|
2015-08-15 15:36:22 -04:00
|
|
|
|
|
2016-06-15 11:14:01 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Bluetooth.
|
|
|
|
|
;;;
|
|
|
|
|
|
2017-08-07 00:07:53 -04:00
|
|
|
|
(define-record-type* <bluetooth-configuration>
|
|
|
|
|
bluetooth-configuration make-bluetooth-configuration
|
|
|
|
|
bluetooth-configuration?
|
|
|
|
|
(bluez bluetooth-configuration-bluez (default bluez))
|
2021-12-19 11:41:46 -05:00
|
|
|
|
|
|
|
|
|
;;; [General]
|
|
|
|
|
(name bluetooth-configuration-name (default "BlueZ"))
|
|
|
|
|
(class bluetooth-configuration-class (default #x000000))
|
|
|
|
|
(discoverable-timeout
|
|
|
|
|
bluetooth-configuration-discoverable-timeout (default 180))
|
|
|
|
|
(always-pairable? bluetooth-configuration-always-pairable? (default #f))
|
|
|
|
|
(pairable-timeout bluetooth-configuration-pairable-timeout (default 0))
|
|
|
|
|
|
|
|
|
|
;;; MAYBE: Exclude into separate <device-id> record-type?
|
|
|
|
|
(device-id bluetooth-configuration-device-id (default #f))
|
|
|
|
|
(reverse-service-discovery?
|
|
|
|
|
bluetooth-configuration-reverse-service-discovery (default #t))
|
|
|
|
|
(name-resolving? bluetooth-configuration-name-resolving? (default #t))
|
|
|
|
|
(debug-keys? bluetooth-configuration-debug-keys? (default #f))
|
|
|
|
|
|
|
|
|
|
;;; Possible values:
|
|
|
|
|
;;; 'dual, 'bredr, 'le
|
|
|
|
|
(controller-mode bluetooth-configuration-controller-mode (default 'dual))
|
|
|
|
|
|
|
|
|
|
;;; Possible values:
|
|
|
|
|
;;; 'off, 'single, 'multiple
|
|
|
|
|
(multi-profile bluetooth-configuration-multi-profile (default 'off))
|
|
|
|
|
(fast-connectable? bluetooth-configuration-fast-connectable? (default #f))
|
|
|
|
|
|
|
|
|
|
;;; Possible values:
|
|
|
|
|
;;; for LE mode: 'off, 'network/on, 'device
|
|
|
|
|
;;; for Dual mode: 'off, 'network/on', 'device, 'limited-network, 'limited-device
|
|
|
|
|
;;; Source: https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/src/main.conf#n68
|
|
|
|
|
(privacy bluetooth-configuration-privacy (default 'off))
|
|
|
|
|
|
|
|
|
|
;;; Possible values:
|
|
|
|
|
;;; 'never, 'confirm, 'always
|
|
|
|
|
(just-works-repairing
|
|
|
|
|
bluetooth-configuration-just-works-repairing (default 'never))
|
|
|
|
|
(temporary-timeout bluetooth-configuration-temporary-timeout (default 30))
|
|
|
|
|
(refresh-discovery? bluetooth-configuration-refresh-discovery (default #t))
|
|
|
|
|
|
|
|
|
|
;;; Possible values: #t, #f, (uuid <uuid>)
|
|
|
|
|
;;; Possible UUIDs:
|
|
|
|
|
;;; d4992530-b9ec-469f-ab01-6c481c47da1c (BlueZ Experimental Debug)
|
|
|
|
|
;;; 671b10b5-42c0-4696-9227-eb28d1b049d6 (BlueZ Experimental Simultaneous Central and Peripheral)
|
|
|
|
|
;;; 15c0a148-c273-11ea-b3de-0242ac130004 (BlueZ Experimental LL privacy)
|
|
|
|
|
;;; 330859bc-7506-492d-9370-9a6f0614037f (BlueZ Experimental Bluetooth Quality Report)
|
|
|
|
|
;;; a6695ace-ee7f-4fb9-881a-5fac66c629af (BlueZ Experimental Offload Codecs)
|
|
|
|
|
;;; Source: https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/src/main.conf#n110
|
|
|
|
|
(experimental bluetooth-configuration-experimental (default #f))
|
|
|
|
|
(remote-name-request-retry-delay
|
|
|
|
|
bluetooth-configuration-remote-name-request-retry-delay (default 300))
|
|
|
|
|
|
|
|
|
|
;;; [BR]
|
|
|
|
|
(page-scan-type bluetooth-configuration-page-scan-type (default #f))
|
|
|
|
|
(page-scan-interval bluetooth-configuration-page-scan-interval (default #f))
|
|
|
|
|
(page-scan-window bluetooth-configuration-page-scan-window (default #f))
|
|
|
|
|
(inquiry-scan-type bluetooth-configuration-inquiry-scan-type (default #f))
|
|
|
|
|
(inquiry-scan-interval bluetooth-configuration-inquiry-scan-interval (default #f))
|
|
|
|
|
(inquiry-scan-window bluetooth-configuration-inquiry-scan-window (default #f))
|
|
|
|
|
(link-supervision-timeout bluetooth-configuration-link-supervision-timeout (default #f))
|
|
|
|
|
(page-timeout bluetooth-configuration-page-timeout (default #f))
|
|
|
|
|
(min-sniff-interval bluetooth-configuration-min-sniff-interval (default #f))
|
|
|
|
|
(max-sniff-interval bluetooth-configuration-max-sniff-interval (default #f))
|
|
|
|
|
|
|
|
|
|
;;; [LE]
|
|
|
|
|
(min-advertisement-interval
|
|
|
|
|
bluetooth-configuration-min-advertisement-interval (default #f))
|
|
|
|
|
(max-advertisement-interval
|
|
|
|
|
bluetooth-configuration-max-advertisement-interval (default #f))
|
|
|
|
|
(multi-advertisement-rotation-interval
|
|
|
|
|
bluetooth-configuration-multi-advertisement-rotation-interval (default #f))
|
|
|
|
|
(scan-interval-auto-connect
|
|
|
|
|
bluetooth-configuration-scan-interval-auto-connect (default #f))
|
|
|
|
|
(scan-window-auto-connect
|
|
|
|
|
bluetooth-configuration-scan-window-auto-connect (default #f))
|
|
|
|
|
(scan-interval-suspend
|
|
|
|
|
bluetooth-configuration-scan-interval-suspend (default #f))
|
|
|
|
|
(scan-window-suspend
|
|
|
|
|
bluetooth-configuration-scan-window-suspend (default #f))
|
|
|
|
|
(scan-interval-discovery
|
|
|
|
|
bluetooth-configuration-scan-interval-discovery (default #f))
|
|
|
|
|
(scan-window-discovery
|
|
|
|
|
bluetooth-configuration-scan-window-discovery (default #f))
|
|
|
|
|
(scan-interval-adv-monitor
|
|
|
|
|
bluetooth-configuration-scan-interval-adv-monitor (default #f))
|
|
|
|
|
(scan-window-adv-monitor
|
|
|
|
|
bluetooth-configuration-scan-window-adv-monitor (default #f))
|
|
|
|
|
(scan-interval-connect
|
|
|
|
|
bluetooth-configuration-scan-interval-connect (default #f))
|
|
|
|
|
(scan-window-connect
|
|
|
|
|
bluetooth-configuration-scan-window-connect (default #f))
|
|
|
|
|
(min-connection-interval
|
|
|
|
|
bluetooth-configuration-min-connection-interval (default #f))
|
|
|
|
|
(max-connection-interval
|
|
|
|
|
bluetooth-configuration-max-connection-interval (default #f))
|
|
|
|
|
(connection-latency
|
|
|
|
|
bluetooth-configuration-connection-latency (default #f))
|
|
|
|
|
(connection-supervision-timeout
|
|
|
|
|
bluetooth-configuration-connection-supervision-timeout (default #f))
|
|
|
|
|
(autoconnect-timeout
|
|
|
|
|
bluetooth-configuration-autoconnect-timeout (default #f))
|
|
|
|
|
(adv-mon-allowlist-scan-duration
|
|
|
|
|
bluetooth-configuration-adv-mon-allowlist-scan-duration (default 300))
|
|
|
|
|
(adv-mon-no-filter-scan-duration
|
|
|
|
|
bluetooth-configuration-adv-mon-no-filter-scan-duration (default 500))
|
|
|
|
|
(enable-adv-mon-interleave-scan?
|
|
|
|
|
bluetooth-configuration-enable-adv-mon-interleave-scan (default #t))
|
|
|
|
|
|
|
|
|
|
;;; [GATT]
|
|
|
|
|
;;; Possible values: 'yes, 'no, 'always
|
|
|
|
|
(cache bluetooth-configuration-cache (default 'always))
|
|
|
|
|
|
|
|
|
|
;;; Possible values: 7 ... 16, 0 (don't care)
|
|
|
|
|
(key-size bluetooth-configuration-key-size (default 0))
|
|
|
|
|
|
|
|
|
|
;;; Possible values: 23 ... 517
|
|
|
|
|
(exchange-mtu bluetooth-configuration-exchange-mtu (default 517))
|
|
|
|
|
|
|
|
|
|
;;; Possible values: 1 ... 5
|
|
|
|
|
(att-channels bluetooth-configuration-att-channels (default 3))
|
|
|
|
|
|
|
|
|
|
;;; [AVDTP]
|
|
|
|
|
;;; Possible values: 'basic, 'ertm
|
|
|
|
|
(session-mode bluetooth-configuration-session-mode (default 'basic))
|
|
|
|
|
|
|
|
|
|
;;; Possible values: 'basic, 'streaming
|
|
|
|
|
(stream-mode bluetooth-configuration-stream-mode (default 'basic))
|
|
|
|
|
|
|
|
|
|
;;; [Policy]
|
|
|
|
|
(reconnect-uuids bluetooth-configuration-reconnect-uuids (default '()))
|
|
|
|
|
(reconnect-attempts bluetooth-configuration-reconnect-attempts (default 7))
|
|
|
|
|
(reconnect-intervals bluetooth-configuration-reconnect-intervals
|
|
|
|
|
(default (list 1 2 4 8 16 32 64)))
|
|
|
|
|
(auto-enable? bluetooth-configuration-auto-enable? (default #f))
|
|
|
|
|
(resume-delay bluetooth-configuration-resume-delay (default 2))
|
|
|
|
|
|
|
|
|
|
;;; [AdvMon]
|
|
|
|
|
;;; Possible values:
|
|
|
|
|
;;; "0x00", "0xFF",
|
|
|
|
|
;;; "N = 0x00" ... "N = 0xFF"
|
|
|
|
|
;;; Source: https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/src/main.conf#n286
|
|
|
|
|
(rssi-sampling-period bluetooth-configuration-rssi-sampling-period
|
|
|
|
|
(default #xFF)))
|
2017-08-07 00:07:53 -04:00
|
|
|
|
|
|
|
|
|
(define (bluetooth-configuration-file config)
|
|
|
|
|
"Return a configuration file for the systemd bluetooth service, as a string."
|
|
|
|
|
(string-append
|
2021-12-19 11:41:46 -05:00
|
|
|
|
"[General]"
|
|
|
|
|
"\nName = " (bluetooth-configuration-name config)
|
|
|
|
|
"\nClass = " (string-append
|
|
|
|
|
"0x"
|
|
|
|
|
(format #f "~6,'0x" (bluetooth-configuration-class config)))
|
|
|
|
|
"\nDiscoverableTimeout = " (number->string
|
|
|
|
|
(bluetooth-configuration-discoverable-timeout
|
|
|
|
|
config))
|
|
|
|
|
"\nAlwaysPairable = " (bool (bluetooth-configuration-always-pairable?
|
|
|
|
|
config))
|
|
|
|
|
"\nPairableTimeout = " (number->string
|
|
|
|
|
(bluetooth-configuration-pairable-timeout
|
|
|
|
|
config))
|
|
|
|
|
(if (bluetooth-configuration-device-id config)
|
|
|
|
|
(string-append "\nDeviceID = " (bluetooth-configuration-device-id config))
|
|
|
|
|
"")
|
|
|
|
|
"\nReverseServiceDiscovery = " (bool
|
|
|
|
|
(bluetooth-configuration-reverse-service-discovery
|
|
|
|
|
config))
|
|
|
|
|
"\nNameResolving = " (bool (bluetooth-configuration-name-resolving? config))
|
|
|
|
|
"\nDebugKeys = " (bool (bluetooth-configuration-debug-keys? config))
|
|
|
|
|
"\nControllerMode = " (symbol->string
|
|
|
|
|
(bluetooth-configuration-controller-mode config))
|
|
|
|
|
"\nMultiProfile = " (symbol->string (bluetooth-configuration-multi-profile
|
|
|
|
|
config))
|
|
|
|
|
"\nFastConnectable = " (bool (bluetooth-configuration-fast-connectable? config))
|
|
|
|
|
"\nPrivacy = " (symbol->string (bluetooth-configuration-privacy config))
|
|
|
|
|
"\nJustWorksRepairing = " (symbol->string
|
|
|
|
|
(bluetooth-configuration-just-works-repairing config))
|
|
|
|
|
"\nTemporaryTimeout = " (number->string
|
|
|
|
|
(bluetooth-configuration-temporary-timeout config))
|
|
|
|
|
"\nRefreshDiscovery = " (bool (bluetooth-configuration-refresh-discovery config))
|
|
|
|
|
"\nExperimental = " (let ((experimental (bluetooth-configuration-experimental config)))
|
|
|
|
|
(cond ((or (eq? experimental #t)
|
|
|
|
|
(eq? experimental #f)) (bool experimental))
|
|
|
|
|
((list? experimental)
|
|
|
|
|
(string-join (map uuid->string experimental) ","))))
|
|
|
|
|
"\nRemoteNameRequestRetryDelay = " (number->string
|
|
|
|
|
(bluetooth-configuration-remote-name-request-retry-delay
|
|
|
|
|
config))
|
|
|
|
|
"\n[BR]"
|
|
|
|
|
(if (bluetooth-configuration-page-scan-type config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nPageScanType = "
|
|
|
|
|
(number->string (bluetooth-configuration-page-scan-type config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-page-scan-interval config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nPageScanInterval = "
|
|
|
|
|
(number->string (bluetooth-configuration-page-scan-interval config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-page-scan-window config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nPageScanWindow = "
|
|
|
|
|
(number->string (bluetooth-configuration-page-scan-window config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-inquiry-scan-type config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nInquiryScanType = "
|
|
|
|
|
(number->string (bluetooth-configuration-inquiry-scan-type config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-inquiry-scan-interval config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nInquiryScanInterval = "
|
|
|
|
|
(number->string (bluetooth-configuration-inquiry-scan-interval config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-inquiry-scan-window config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nInquiryScanWindow = "
|
|
|
|
|
(number->string (bluetooth-configuration-inquiry-scan-window config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-link-supervision-timeout config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nLinkSupervisionTimeout = "
|
|
|
|
|
(number->string (bluetooth-configuration-link-supervision-timeout config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-page-timeout config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nPageTimeout = "
|
|
|
|
|
(number->string (bluetooth-configuration-page-timeout config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-min-sniff-interval config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nMinSniffInterval = "
|
|
|
|
|
(number->string (bluetooth-configuration-min-sniff-interval config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-max-sniff-interval config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nMaxSniffInterval = "
|
|
|
|
|
(number->string (bluetooth-configuration-max-sniff-interval config)))
|
|
|
|
|
"")
|
|
|
|
|
|
|
|
|
|
"\n[LE]"
|
|
|
|
|
(if (bluetooth-configuration-min-advertisement-interval config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nMinAdvertisementInterval = "
|
|
|
|
|
(number->string (bluetooth-configuration-min-advertisement-interval config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-max-advertisement-interval config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nMaxAdvertisementInterval = "
|
|
|
|
|
(number->string (bluetooth-configuration-max-advertisement-interval config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-multi-advertisement-rotation-interval config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nMultiAdvertisementRotationInterval = "
|
|
|
|
|
(number->string
|
|
|
|
|
(bluetooth-configuration-multi-advertisement-rotation-interval config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-scan-interval-auto-connect config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nScanIntervalAutoConnect = "
|
|
|
|
|
(number->string (bluetooth-configuration-scan-interval-auto-connect config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-scan-window-auto-connect config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nScanWindowAutoConnect = "
|
|
|
|
|
(number->string (bluetooth-configuration-scan-window-auto-connect config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-scan-interval-suspend config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nScanIntervalSuspend = "
|
|
|
|
|
(number->string (bluetooth-configuration-scan-interval-suspend config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-scan-window-suspend config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nScanWindowSuspend = "
|
|
|
|
|
(number->string (bluetooth-configuration-scan-window-suspend config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-scan-interval-discovery config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nScanIntervalDiscovery = "
|
|
|
|
|
(number->string (bluetooth-configuration-scan-interval-discovery config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-scan-window-discovery config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nScanWindowDiscovery = "
|
|
|
|
|
(number->string (bluetooth-configuration-scan-window-discovery config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-scan-interval-adv-monitor config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nScanIntervalAdvMonitor = "
|
|
|
|
|
(number->string (bluetooth-configuration-scan-interval-adv-monitor config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-scan-window-adv-monitor config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nScanWindowAdvMonitor = "
|
|
|
|
|
(number->string (bluetooth-configuration-scan-window-adv-monitor config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-scan-interval-connect config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nScanIntervalConnect = "
|
|
|
|
|
(number->string (bluetooth-configuration-scan-interval-connect config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-scan-window-connect config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nScanWindowConnect = "
|
|
|
|
|
(number->string (bluetooth-configuration-scan-window-connect config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-min-connection-interval config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nMinConnectionInterval = "
|
|
|
|
|
(number->string (bluetooth-configuration-min-connection-interval config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-max-connection-interval config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nMaxConnectionInterval = "
|
|
|
|
|
(number->string (bluetooth-configuration-max-connection-interval config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-connection-latency config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nConnectionLatency = "
|
|
|
|
|
(number->string (bluetooth-configuration-connection-latency config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-connection-supervision-timeout config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nConnectionSupervisionTimeout = "
|
|
|
|
|
(number->string (bluetooth-configuration-connection-supervision-timeout config)))
|
|
|
|
|
"")
|
|
|
|
|
(if (bluetooth-configuration-autoconnect-timeout config)
|
|
|
|
|
(string-append
|
|
|
|
|
"\nAutoconnecttimeout = "
|
|
|
|
|
(number->string (bluetooth-configuration-autoconnect-timeout config)))
|
|
|
|
|
"")
|
|
|
|
|
"\nAdvMonAllowlistScanDuration = " (number->string
|
|
|
|
|
(bluetooth-configuration-adv-mon-allowlist-scan-duration
|
|
|
|
|
config))
|
|
|
|
|
"\nAdvMonNoFilterScanDuration = " (number->string
|
|
|
|
|
(bluetooth-configuration-adv-mon-no-filter-scan-duration
|
|
|
|
|
config))
|
|
|
|
|
"\nEnableAdvMonInterleaveScan = " (number->string
|
|
|
|
|
(if (eq? #t
|
|
|
|
|
(bluetooth-configuration-enable-adv-mon-interleave-scan
|
|
|
|
|
config))
|
|
|
|
|
1 0))
|
2022-12-29 02:15:42 -05:00
|
|
|
|
|
2021-12-19 11:41:46 -05:00
|
|
|
|
"\n[GATT]"
|
|
|
|
|
"\nCache = " (symbol->string (bluetooth-configuration-cache config))
|
|
|
|
|
"\nKeySize = " (number->string (bluetooth-configuration-key-size config))
|
|
|
|
|
"\nExchangeMTU = " (number->string (bluetooth-configuration-exchange-mtu config))
|
|
|
|
|
"\nChannels = " (number->string (bluetooth-configuration-att-channels config))
|
|
|
|
|
|
|
|
|
|
"\n[AVDTP]"
|
|
|
|
|
"\nSessionMode = " (symbol->string (bluetooth-configuration-session-mode config))
|
|
|
|
|
"\nStreamMode = " (symbol->string (bluetooth-configuration-stream-mode config))
|
|
|
|
|
|
|
|
|
|
"\n[Policy]"
|
|
|
|
|
(let ((uuids (bluetooth-configuration-reconnect-uuids config)))
|
|
|
|
|
(if (not (eq? '() uuids))
|
|
|
|
|
(string-append
|
|
|
|
|
"\nReconnectUUIDs = "
|
|
|
|
|
(string-join (map uuid->string uuids) ","))
|
|
|
|
|
""))
|
|
|
|
|
"\nReconnectAttempts = " (number->string
|
|
|
|
|
(bluetooth-configuration-reconnect-attempts config))
|
|
|
|
|
"\nReconnectIntervals = " (string-join
|
|
|
|
|
(map number->string
|
|
|
|
|
(bluetooth-configuration-reconnect-intervals
|
|
|
|
|
config))
|
|
|
|
|
",")
|
|
|
|
|
"\nAutoEnable = " (bool (bluetooth-configuration-auto-enable?
|
|
|
|
|
config))
|
|
|
|
|
"\nResumeDelay = " (number->string (bluetooth-configuration-resume-delay config))
|
|
|
|
|
|
|
|
|
|
"\n[AdvMon]"
|
|
|
|
|
"\nRSSISamplingPeriod = " (string-append
|
|
|
|
|
"0x"
|
|
|
|
|
(format #f "~2,'0x"
|
|
|
|
|
(bluetooth-configuration-rssi-sampling-period config)))))
|
2017-08-07 00:07:53 -04:00
|
|
|
|
|
|
|
|
|
(define (bluetooth-directory config)
|
|
|
|
|
(computed-file "etc-bluetooth"
|
|
|
|
|
#~(begin
|
|
|
|
|
(mkdir #$output)
|
|
|
|
|
(chdir #$output)
|
|
|
|
|
(call-with-output-file "main.conf"
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(display #$(bluetooth-configuration-file config)
|
|
|
|
|
port))))))
|
|
|
|
|
|
|
|
|
|
(define (bluetooth-shepherd-service config)
|
2016-06-15 11:14:01 -04:00
|
|
|
|
"Return a shepherd service for @command{bluetoothd}."
|
|
|
|
|
(shepherd-service
|
|
|
|
|
(provision '(bluetooth))
|
|
|
|
|
(requirement '(dbus-system udev))
|
|
|
|
|
(documentation "Run the bluetoothd daemon.")
|
|
|
|
|
(start #~(make-forkexec-constructor
|
2020-04-20 13:36:41 -04:00
|
|
|
|
(list #$(file-append (bluetooth-configuration-bluez config)
|
|
|
|
|
"/libexec/bluetooth/bluetoothd"))))
|
2016-06-15 11:14:01 -04:00
|
|
|
|
(stop #~(make-kill-destructor))))
|
|
|
|
|
|
|
|
|
|
(define bluetooth-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'bluetooth)
|
|
|
|
|
(extensions
|
2017-08-07 00:07:53 -04:00
|
|
|
|
(list (service-extension dbus-root-service-type
|
|
|
|
|
(compose list bluetooth-configuration-bluez))
|
|
|
|
|
(service-extension udev-service-type
|
|
|
|
|
(compose list bluetooth-configuration-bluez))
|
|
|
|
|
(service-extension etc-service-type
|
|
|
|
|
(lambda (config)
|
|
|
|
|
`(("bluetooth"
|
|
|
|
|
,(bluetooth-directory config)))))
|
2016-06-15 11:14:01 -04:00
|
|
|
|
(service-extension shepherd-root-service-type
|
2019-04-30 05:59:47 -04:00
|
|
|
|
(compose list bluetooth-shepherd-service))))
|
2020-09-23 13:06:28 -04:00
|
|
|
|
(default-value (bluetooth-configuration))
|
2019-04-30 05:59:47 -04:00
|
|
|
|
(description "Run the @command{bluetoothd} daemon, which manages all the
|
|
|
|
|
Bluetooth devices and provides a number of D-Bus interfaces.")))
|
2016-06-15 11:14:01 -04:00
|
|
|
|
|
2023-02-25 13:58:07 -05:00
|
|
|
|
(define-deprecated (bluetooth-service #:key (bluez bluez) (auto-enable? #f))
|
|
|
|
|
bluetooth-service-type
|
2016-06-15 11:14:01 -04:00
|
|
|
|
"Return a service that runs the @command{bluetoothd} daemon, which manages
|
2017-08-07 00:07:53 -04:00
|
|
|
|
all the Bluetooth devices and provides a number of D-Bus interfaces. When
|
|
|
|
|
AUTO-ENABLE? is true, the bluetooth controller is powered automatically at
|
2022-12-12 14:27:37 -05:00
|
|
|
|
boot, which can be useful when using a bluetooth keyboard or mouse.
|
2016-06-15 11:14:01 -04:00
|
|
|
|
"
|
2017-08-07 00:07:53 -04:00
|
|
|
|
(service bluetooth-service-type
|
|
|
|
|
(bluetooth-configuration
|
|
|
|
|
(bluez bluez)
|
|
|
|
|
(auto-enable? auto-enable?))))
|
2016-06-15 11:14:01 -04:00
|
|
|
|
|
2015-11-01 11:19:33 -05:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Colord D-Bus service.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define %colord-activation
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
|
(mkdir-p "/var/lib/colord")
|
|
|
|
|
(let ((user (getpwnam "colord")))
|
|
|
|
|
(chown "/var/lib/colord"
|
|
|
|
|
(passwd:uid user) (passwd:gid user)))))
|
|
|
|
|
|
|
|
|
|
(define %colord-accounts
|
|
|
|
|
(list (user-group (name "colord") (system? #t))
|
|
|
|
|
(user-account
|
|
|
|
|
(name "colord")
|
|
|
|
|
(group "colord")
|
|
|
|
|
(system? #t)
|
|
|
|
|
(comment "colord daemon user")
|
|
|
|
|
(home-directory "/var/empty")
|
system: Use 'file-append' to denote file names.
* gnu/services/avahi.scm, gnu/services/base.scm,
gnu/services/databases.scm, gnu/services/dbus.scm,
gnu/services/desktop.scm, gnu/services/dict.scm,
gnu/services/mail.scm, gnu/services/networking.scm,
gnu/services/sddm.scm, gnu/services/spice.scm,
gnu/services/ssh.scm, gnu/services/web.scm,
gnu/services/xorg.scm, gnu/system.scm: Replace the
#~(string-append #$pkg "/bin/foo") idiom with
(file-append pkg "/bin/foo").
2016-09-10 06:03:47 -04:00
|
|
|
|
(shell (file-append shadow "/sbin/nologin")))))
|
2015-11-01 11:19:33 -05:00
|
|
|
|
|
|
|
|
|
(define colord-service-type
|
|
|
|
|
(service-type (name 'colord)
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension account-service-type
|
|
|
|
|
(const %colord-accounts))
|
|
|
|
|
(service-extension activation-service-type
|
|
|
|
|
(const %colord-activation))
|
|
|
|
|
|
|
|
|
|
;; Colord is a D-Bus service that dbus-daemon can
|
|
|
|
|
;; activate.
|
|
|
|
|
(service-extension dbus-root-service-type list)
|
|
|
|
|
|
|
|
|
|
;; Colord provides "color device" rules for udev.
|
|
|
|
|
(service-extension udev-service-type list)
|
|
|
|
|
|
|
|
|
|
;; It provides polkit "actions".
|
2019-04-30 06:02:29 -04:00
|
|
|
|
(service-extension polkit-service-type list)))
|
2019-10-29 18:26:37 -04:00
|
|
|
|
(default-value colord)
|
2019-04-30 06:02:29 -04:00
|
|
|
|
(description
|
|
|
|
|
"Run @command{colord}, a system service with a D-Bus
|
|
|
|
|
interface to manage the color profiles of input and output devices such as
|
|
|
|
|
screens and scanners.")))
|
2015-11-01 11:19:33 -05:00
|
|
|
|
|
2015-11-01 11:55:26 -05:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; UDisks.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-record-type* <udisks-configuration>
|
|
|
|
|
udisks-configuration make-udisks-configuration
|
|
|
|
|
udisks-configuration?
|
|
|
|
|
(udisks udisks-configuration-udisks
|
|
|
|
|
(default udisks)))
|
|
|
|
|
|
2017-11-24 18:08:14 -05:00
|
|
|
|
(define %udisks-activation
|
|
|
|
|
(with-imported-modules '((guix build utils))
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
|
|
|
|
|
|
(let ((run-dir "/var/run/udisks2"))
|
|
|
|
|
(mkdir-p run-dir)
|
|
|
|
|
(chmod run-dir #o700)))))
|
|
|
|
|
|
2015-11-01 11:55:26 -05:00
|
|
|
|
(define udisks-service-type
|
|
|
|
|
(let ((udisks-package (lambda (config)
|
|
|
|
|
(list (udisks-configuration-udisks config)))))
|
|
|
|
|
(service-type (name 'udisks)
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension polkit-service-type
|
|
|
|
|
udisks-package)
|
|
|
|
|
(service-extension dbus-root-service-type
|
|
|
|
|
udisks-package)
|
|
|
|
|
(service-extension udev-service-type
|
2015-11-02 16:22:36 -05:00
|
|
|
|
udisks-package)
|
2017-11-24 18:08:14 -05:00
|
|
|
|
(service-extension activation-service-type
|
|
|
|
|
(const %udisks-activation))
|
2015-11-02 16:22:36 -05:00
|
|
|
|
|
|
|
|
|
;; Profile 'udisksctl' & co. in the system profile.
|
|
|
|
|
(service-extension profile-service-type
|
2022-04-29 06:24:20 -04:00
|
|
|
|
udisks-package)))
|
|
|
|
|
(description "Run UDisks, a @dfn{disk management} daemon
|
|
|
|
|
that provides user interfaces with notifications and ways to mount/unmount
|
|
|
|
|
disks. Programs that talk to UDisks include the @command{udisksctl} command,
|
2023-02-25 13:58:05 -05:00
|
|
|
|
part of UDisks, and GNOME Disks.")
|
|
|
|
|
(default-value (udisks-configuration)))))
|
2015-11-01 11:55:26 -05:00
|
|
|
|
|
2023-02-25 13:58:05 -05:00
|
|
|
|
(define-deprecated (udisks-service #:key (udisks udisks))
|
|
|
|
|
udisks-service-type
|
2015-11-01 11:55:26 -05:00
|
|
|
|
"Return a service for @uref{http://udisks.freedesktop.org/docs/latest/,
|
|
|
|
|
UDisks}, a @dfn{disk management} daemon that provides user interfaces with
|
|
|
|
|
notifications and ways to mount/unmount disks. Programs that talk to UDisks
|
|
|
|
|
include the @command{udisksctl} command, part of UDisks, and GNOME Disks."
|
|
|
|
|
(service udisks-service-type
|
|
|
|
|
(udisks-configuration (udisks udisks))))
|
|
|
|
|
|
2024-04-22 08:42:13 -04:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; GVfs virtual file system.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-record-type* <gvfs-configuration>
|
|
|
|
|
gvfs-configuration make-gvfs-configuration
|
|
|
|
|
gvfs-configuration?
|
|
|
|
|
(gvfs gvfs-package (default gvfs)))
|
|
|
|
|
|
|
|
|
|
(define gvfs-service-type
|
|
|
|
|
(service-type (name 'gvfs)
|
|
|
|
|
(extensions
|
|
|
|
|
(list
|
|
|
|
|
(service-extension profile-service-type
|
|
|
|
|
(compose list gvfs-package))
|
|
|
|
|
;; Required for gvfs-udisks2-volume-monitor.
|
|
|
|
|
(service-extension udisks-service-type (const #t))))
|
|
|
|
|
(description
|
|
|
|
|
"Make GVfs virtual file systems (Trash, SFTP, SMB, HTTP,
|
|
|
|
|
and many other) available for GIO applications.")
|
|
|
|
|
(default-value (gvfs-configuration))))
|
|
|
|
|
|
2015-08-18 05:56:17 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Elogind login and seat management service.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-record-type* <elogind-configuration> elogind-configuration
|
|
|
|
|
make-elogind-configuration
|
2019-10-22 11:29:35 -04:00
|
|
|
|
elogind-configuration?
|
2020-09-28 09:55:55 -04:00
|
|
|
|
(elogind elogind-package
|
|
|
|
|
(default elogind))
|
|
|
|
|
(kill-user-processes? elogind-kill-user-processes?
|
|
|
|
|
(default #f))
|
|
|
|
|
(kill-only-users elogind-kill-only-users
|
|
|
|
|
(default '()))
|
|
|
|
|
(kill-exclude-users elogind-kill-exclude-users
|
|
|
|
|
(default '("root")))
|
|
|
|
|
(inhibit-delay-max-seconds elogind-inhibit-delay-max-seconds
|
|
|
|
|
(default 5))
|
|
|
|
|
(handle-power-key elogind-handle-power-key
|
|
|
|
|
(default 'poweroff))
|
|
|
|
|
(handle-suspend-key elogind-handle-suspend-key
|
|
|
|
|
(default 'suspend))
|
|
|
|
|
(handle-hibernate-key elogind-handle-hibernate-key
|
2023-02-25 13:58:02 -05:00
|
|
|
|
(default 'hibernate))
|
2020-09-28 09:55:55 -04:00
|
|
|
|
(handle-lid-switch elogind-handle-lid-switch
|
|
|
|
|
(default 'suspend))
|
|
|
|
|
(handle-lid-switch-docked elogind-handle-lid-switch-docked
|
|
|
|
|
(default 'ignore))
|
|
|
|
|
(handle-lid-switch-external-power elogind-handle-lid-switch-external-power
|
2022-08-09 23:51:48 -04:00
|
|
|
|
(default *unspecified*))
|
2020-09-28 09:55:55 -04:00
|
|
|
|
(power-key-ignore-inhibited? elogind-power-key-ignore-inhibited?
|
|
|
|
|
(default #f))
|
|
|
|
|
(suspend-key-ignore-inhibited? elogind-suspend-key-ignore-inhibited?
|
|
|
|
|
(default #f))
|
|
|
|
|
(hibernate-key-ignore-inhibited? elogind-hibernate-key-ignore-inhibited?
|
|
|
|
|
(default #f))
|
|
|
|
|
(lid-switch-ignore-inhibited? elogind-lid-switch-ignore-inhibited?
|
|
|
|
|
(default #t))
|
|
|
|
|
(holdoff-timeout-seconds elogind-holdoff-timeout-seconds
|
|
|
|
|
(default 30))
|
|
|
|
|
(idle-action elogind-idle-action
|
|
|
|
|
(default 'ignore))
|
|
|
|
|
(idle-action-seconds elogind-idle-action-seconds
|
|
|
|
|
(default (* 30 60)))
|
|
|
|
|
(runtime-directory-size-percent elogind-runtime-directory-size-percent
|
|
|
|
|
(default 10))
|
|
|
|
|
(runtime-directory-size elogind-runtime-directory-size
|
|
|
|
|
(default #f))
|
|
|
|
|
(remove-ipc? elogind-remove-ipc?
|
|
|
|
|
(default #t))
|
|
|
|
|
|
|
|
|
|
(suspend-state elogind-suspend-state
|
|
|
|
|
(default '("mem" "standby" "freeze")))
|
|
|
|
|
(suspend-mode elogind-suspend-mode
|
|
|
|
|
(default '()))
|
|
|
|
|
(hibernate-state elogind-hibernate-state
|
|
|
|
|
(default '("disk")))
|
|
|
|
|
(hibernate-mode elogind-hibernate-mode
|
|
|
|
|
(default '("platform" "shutdown")))
|
|
|
|
|
(hybrid-sleep-state elogind-hybrid-sleep-state
|
|
|
|
|
(default '("disk")))
|
|
|
|
|
(hybrid-sleep-mode elogind-hybrid-sleep-mode
|
|
|
|
|
(default
|
2024-08-06 21:51:37 -04:00
|
|
|
|
'("suspend" "platform" "shutdown")))
|
|
|
|
|
(hibernate-delay-seconds elogind-hibernate-delay-seconds
|
|
|
|
|
(default *unspecified*))
|
|
|
|
|
(suspend-estimation-seconds elogind-suspend-estimation-seconds
|
|
|
|
|
(default *unspecified*)))
|
2015-08-18 05:56:17 -04:00
|
|
|
|
|
|
|
|
|
(define (elogind-configuration-file config)
|
|
|
|
|
(define (yesno x)
|
|
|
|
|
(match x
|
|
|
|
|
(#t "yes")
|
|
|
|
|
(#f "no")
|
|
|
|
|
(_ (error "expected #t or #f, instead got:" x))))
|
|
|
|
|
(define char-set:user-name
|
|
|
|
|
(string->char-set "abcdefghijklmnopqrstuvwxyz0123456789_-"))
|
|
|
|
|
(define (valid-list? l pred)
|
|
|
|
|
(and-map (lambda (x) (string-every pred x)) l))
|
|
|
|
|
(define (user-name-list users)
|
|
|
|
|
(unless (valid-list? users char-set:user-name)
|
|
|
|
|
(error "invalid user list" users))
|
|
|
|
|
(string-join users " "))
|
|
|
|
|
(define (enum val allowed)
|
|
|
|
|
(unless (memq val allowed)
|
|
|
|
|
(error "invalid value" val allowed))
|
|
|
|
|
(symbol->string val))
|
|
|
|
|
(define (non-negative-integer x)
|
|
|
|
|
(unless (exact-integer? x) (error "not an integer" x))
|
|
|
|
|
(when (negative? x) (error "negative number not allowed" x))
|
|
|
|
|
(number->string x))
|
2024-08-06 21:51:37 -04:00
|
|
|
|
(define (maybe-non-negative-integer x)
|
|
|
|
|
(or (and (unspecified? x) x)
|
|
|
|
|
(non-negative-integer x)))
|
2015-08-18 05:56:17 -04:00
|
|
|
|
(define handle-actions
|
2024-08-06 21:51:37 -04:00
|
|
|
|
'(ignore poweroff reboot halt kexec suspend hibernate hybrid-sleep suspend-then-hibernate lock))
|
2015-08-18 05:56:17 -04:00
|
|
|
|
(define (handle-action x)
|
2022-08-09 23:51:48 -04:00
|
|
|
|
(if (unspecified? x)
|
2022-09-16 11:11:06 -04:00
|
|
|
|
x ;let the unspecified value go through
|
2022-08-09 23:51:48 -04:00
|
|
|
|
(enum x handle-actions)))
|
2015-08-18 05:56:17 -04:00
|
|
|
|
(define (sleep-list tokens)
|
|
|
|
|
(unless (valid-list? tokens char-set:user-name)
|
|
|
|
|
(error "invalid sleep list" tokens))
|
|
|
|
|
(string-join tokens " "))
|
|
|
|
|
(define-syntax ini-file-clause
|
|
|
|
|
(syntax-rules ()
|
2022-09-16 11:11:06 -04:00
|
|
|
|
;; Produce an empty line when encountering an unspecified value. This
|
|
|
|
|
;; is better than an empty string value, which can, in some cases, cause
|
|
|
|
|
;; warnings such as "Failed to parse handle action setting".
|
2015-08-18 05:56:17 -04:00
|
|
|
|
((_ config (prop (parser getter)))
|
2022-09-16 11:11:06 -04:00
|
|
|
|
(let ((value (parser (getter config))))
|
|
|
|
|
(if (unspecified? value)
|
|
|
|
|
""
|
|
|
|
|
(string-append prop "=" value "\n"))))
|
2015-08-18 05:56:17 -04:00
|
|
|
|
((_ config str)
|
2022-09-16 11:11:06 -04:00
|
|
|
|
(if (unspecified? str)
|
|
|
|
|
""
|
|
|
|
|
(string-append str "\n")))))
|
2015-08-18 05:56:17 -04:00
|
|
|
|
(define-syntax-rule (ini-file config file clause ...)
|
system: Make service procedures non-monadic.
* gnu/services/avahi.scm (configuration-file): Use 'plain-file' instead
of 'text-file'.
(avahi-service): Turn into a regular procedure that returns a <service>.
* gnu/services/base.scm (root-file-system-service, file-system-service,
user-unmount-service, user-processes-service, host-name-service,
console-keymap-service, console-font-service, mingetty-service,
nscd.conf-file, nscd-service): Likewise.
(%default-syslog.conf): New variable.
(syslog-service): Use it. Turn into a regular procedure.
(guix-service, udev-rules-union, kvm-udev-rule, udev-service,
device-mapping-service, swap-service): Likewise.
* gnu/services/databases.scm (%default-postgres-hba,
%default-postgres-ident): Use 'plain-file' instead of 'text-file'.
(%default-postgres-config): Use 'mixed-text-file' instead of
'text-file*'.
(postgresql-service): Use 'program-file' instead of 'gexp->script'.
Turn into a regular procedure.
* gnu/services/desktop.scm (dbus-configuration-directory): Use
'computed-file' instead of 'gexp->derivation'.
(upower-configuration-file, geoclue-configuration-file,
elogind-configuration-file): Use 'plain-file' instead of 'text-file'.
(dbus-service, upower-service, colord-service, geoclue-service,
polkit-service, elogind-service): Turn into regular procedures.
(%desktop-services): Remove use of 'mlet' when iterating on
%BASE-SERVICES.
* gnu/services/lirc.scm (lirc-service): Turn into a regular procedure.
* gnu/services/networking.scm (static-networking-service,
dhcp-client-service, ntp-service, tor-service, bitlbee-service,
wicd-service): Likewise.
* gnu/services/ssh.scm (lsh-service): Likewise.
* gnu/services/web.scm (nginx-service): Likewise.
* gnu/services/xorg.scm (xorg-configuration-file): Use 'mixed-text-file'
instead of 'text-file*'.
(xorg-start-command, slim-service): Turn into regular procedures.
(xinitrc): Use 'program-file' instead of 'gexp->script'.
* gnu/system/install.scm (cow-store-service,
configuration-template-service): Turn into regular procedures.
* gnu/system.scm (other-file-system-services, device-mapping-services,
swap-services, essential-services, operating-system-services,
user-shells, operating-system-accounts): Remove now unnecessary
'mlet' and turn into regular procedures.
(operating-system-etc-directory, operating-system-activation-script,
operating-system-boot-script): Adjust accordingly.
* doc/guix.texi (Base Services, Networking Services, X Window, Desktop
Services, Database Services, Web Services, Various Services, Name
Service Switch): Adjust accordingly.
2015-09-09 03:17:31 -04:00
|
|
|
|
(plain-file file (string-append (ini-file-clause config clause) ...)))
|
2015-08-18 05:56:17 -04:00
|
|
|
|
(ini-file
|
|
|
|
|
config "logind.conf"
|
|
|
|
|
"[Login]"
|
|
|
|
|
("KillUserProcesses" (yesno elogind-kill-user-processes?))
|
|
|
|
|
("KillOnlyUsers" (user-name-list elogind-kill-only-users))
|
|
|
|
|
("KillExcludeUsers" (user-name-list elogind-kill-exclude-users))
|
2018-11-07 10:37:34 -05:00
|
|
|
|
("InhibitDelayMaxSec" (non-negative-integer elogind-inhibit-delay-max-seconds))
|
2015-08-18 05:56:17 -04:00
|
|
|
|
("HandlePowerKey" (handle-action elogind-handle-power-key))
|
|
|
|
|
("HandleSuspendKey" (handle-action elogind-handle-suspend-key))
|
|
|
|
|
("HandleHibernateKey" (handle-action elogind-handle-hibernate-key))
|
|
|
|
|
("HandleLidSwitch" (handle-action elogind-handle-lid-switch))
|
|
|
|
|
("HandleLidSwitchDocked" (handle-action elogind-handle-lid-switch-docked))
|
2020-09-28 09:55:55 -04:00
|
|
|
|
("HandleLidSwitchExternalPower" (handle-action elogind-handle-lid-switch-external-power))
|
2015-08-18 05:56:17 -04:00
|
|
|
|
("PowerKeyIgnoreInhibited" (yesno elogind-power-key-ignore-inhibited?))
|
|
|
|
|
("SuspendKeyIgnoreInhibited" (yesno elogind-suspend-key-ignore-inhibited?))
|
|
|
|
|
("HibernateKeyIgnoreInhibited" (yesno elogind-hibernate-key-ignore-inhibited?))
|
|
|
|
|
("LidSwitchIgnoreInhibited" (yesno elogind-lid-switch-ignore-inhibited?))
|
2018-11-07 10:37:34 -05:00
|
|
|
|
("HoldoffTimeoutSec" (non-negative-integer elogind-holdoff-timeout-seconds))
|
2015-08-18 05:56:17 -04:00
|
|
|
|
("IdleAction" (handle-action elogind-idle-action))
|
2018-11-07 10:37:34 -05:00
|
|
|
|
("IdleActionSec" (non-negative-integer elogind-idle-action-seconds))
|
2015-08-18 05:56:17 -04:00
|
|
|
|
("RuntimeDirectorySize"
|
|
|
|
|
(identity
|
|
|
|
|
(lambda (config)
|
|
|
|
|
(match (elogind-runtime-directory-size-percent config)
|
|
|
|
|
(#f (non-negative-integer (elogind-runtime-directory-size config)))
|
|
|
|
|
(percent (string-append (non-negative-integer percent) "%"))))))
|
2018-11-07 10:37:34 -05:00
|
|
|
|
("RemoveIPC" (yesno elogind-remove-ipc?))
|
2015-08-18 05:56:17 -04:00
|
|
|
|
"[Sleep]"
|
|
|
|
|
("SuspendState" (sleep-list elogind-suspend-state))
|
|
|
|
|
("SuspendMode" (sleep-list elogind-suspend-mode))
|
|
|
|
|
("HibernateState" (sleep-list elogind-hibernate-state))
|
|
|
|
|
("HibernateMode" (sleep-list elogind-hibernate-mode))
|
|
|
|
|
("HybridSleepState" (sleep-list elogind-hybrid-sleep-state))
|
2024-08-06 21:51:37 -04:00
|
|
|
|
("HybridSleepMode" (sleep-list elogind-hybrid-sleep-mode))
|
|
|
|
|
("HibernateDelaySec" (maybe-non-negative-integer elogind-hibernate-delay-seconds))
|
|
|
|
|
("SuspendEstimationSec" (maybe-non-negative-integer elogind-suspend-estimation-seconds))))
|
2015-08-18 05:56:17 -04:00
|
|
|
|
|
2016-03-06 18:01:03 -05:00
|
|
|
|
(define (elogind-dbus-service config)
|
2022-05-27 16:41:55 -04:00
|
|
|
|
"Return a @file{org.freedesktop.login1.service} file that tells D-Bus how to
|
|
|
|
|
\"start\" elogind. In practice though, our elogind is started when booting by
|
|
|
|
|
shepherd. Thus, the @code{Exec} line of this @file{.service} file does not
|
|
|
|
|
explain how to start elogind; instead, it spawns a wrapper that waits for the
|
|
|
|
|
@code{elogind} shepherd service. This avoids a race condition where both
|
|
|
|
|
@command{shepherd} and @command{dbus-daemon} would attempt to start elogind."
|
|
|
|
|
;; For more info on the elogind startup race, see
|
|
|
|
|
;; <https://issues.guix.gnu.org/55444>.
|
|
|
|
|
|
|
|
|
|
(define elogind
|
|
|
|
|
(elogind-package config))
|
|
|
|
|
|
|
|
|
|
(define wrapper
|
|
|
|
|
(program-file "elogind-dbus-shepherd-sync"
|
|
|
|
|
(with-imported-modules '((gnu services herd))
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (gnu services herd)
|
|
|
|
|
(srfi srfi-34))
|
|
|
|
|
|
|
|
|
|
(guard (c ((service-not-found-error? c)
|
|
|
|
|
(format (current-error-port)
|
|
|
|
|
"no elogind shepherd service~%")
|
|
|
|
|
(exit 1))
|
|
|
|
|
((shepherd-error? c)
|
|
|
|
|
(format (current-error-port)
|
|
|
|
|
"elogind shepherd service not \
|
|
|
|
|
started~%")
|
|
|
|
|
(exit 2)))
|
|
|
|
|
(wait-for-service 'elogind))))))
|
|
|
|
|
|
|
|
|
|
(define build
|
|
|
|
|
(with-imported-modules '((guix build utils))
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils)
|
|
|
|
|
(ice-9 match))
|
|
|
|
|
|
|
|
|
|
(define service-directory
|
|
|
|
|
"/share/dbus-1/system-services")
|
|
|
|
|
|
|
|
|
|
(mkdir-p (dirname (string-append #$output service-directory)))
|
|
|
|
|
(copy-recursively (string-append #$elogind service-directory)
|
|
|
|
|
(string-append #$output service-directory))
|
|
|
|
|
(symlink (string-append #$elogind "/etc") ;for etc/dbus-1
|
|
|
|
|
(string-append #$output "/etc"))
|
2023-07-27 12:49:30 -04:00
|
|
|
|
;; Also expose the D-Bus policy configurations (.conf) files, now
|
|
|
|
|
;; installed under '/share' instead of the legacy '/etc' prefix.
|
|
|
|
|
(symlink (string-append #$elogind "/share/dbus-1/system.d")
|
|
|
|
|
(string-append #$output "/share/dbus-1/system.d"))
|
2022-05-27 16:41:55 -04:00
|
|
|
|
|
|
|
|
|
;; Replace the "Exec=" line of the 'org.freedesktop.login1.service'
|
|
|
|
|
;; file with one that refers to WRAPPER instead of elogind.
|
|
|
|
|
(match (find-files #$output "\\.service$")
|
|
|
|
|
((file)
|
|
|
|
|
(substitute* file
|
|
|
|
|
(("Exec[[:blank:]]*=.*" _)
|
|
|
|
|
(string-append "Exec=" #$wrapper "\n"))))))))
|
|
|
|
|
|
|
|
|
|
(list (computed-file "elogind-dbus-service-wrapper" build)))
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
|
2016-02-06 05:57:54 -05:00
|
|
|
|
(define (pam-extension-procedure config)
|
|
|
|
|
"Return an extension for PAM-ROOT-SERVICE-TYPE that ensures that all the PAM
|
|
|
|
|
services use 'pam_elogind.so', a module that allows elogind to keep track of
|
|
|
|
|
logged-in users (run 'loginctl' to see elogind's world view of users and
|
|
|
|
|
seats.)"
|
|
|
|
|
(define pam-elogind
|
|
|
|
|
(pam-entry
|
|
|
|
|
(control "required")
|
system: Use 'file-append' to denote file names.
* gnu/services/avahi.scm, gnu/services/base.scm,
gnu/services/databases.scm, gnu/services/dbus.scm,
gnu/services/desktop.scm, gnu/services/dict.scm,
gnu/services/mail.scm, gnu/services/networking.scm,
gnu/services/sddm.scm, gnu/services/spice.scm,
gnu/services/ssh.scm, gnu/services/web.scm,
gnu/services/xorg.scm, gnu/system.scm: Replace the
#~(string-append #$pkg "/bin/foo") idiom with
(file-append pkg "/bin/foo").
2016-09-10 06:03:47 -04:00
|
|
|
|
(module (file-append (elogind-package config)
|
|
|
|
|
"/lib/security/pam_elogind.so"))))
|
2016-02-06 05:57:54 -05:00
|
|
|
|
|
2023-05-09 12:45:07 -04:00
|
|
|
|
(list (pam-extension
|
|
|
|
|
(transformer
|
|
|
|
|
(lambda (pam)
|
|
|
|
|
(pam-service
|
|
|
|
|
(inherit pam)
|
2023-05-09 12:45:08 -04:00
|
|
|
|
(session (cons pam-elogind (pam-service-session pam))))))
|
|
|
|
|
(shepherd-requirements '(elogind)))))
|
2016-02-06 05:57:54 -05:00
|
|
|
|
|
2017-07-11 04:54:12 -04:00
|
|
|
|
(define (elogind-shepherd-service config)
|
|
|
|
|
"Return a Shepherd service to start elogind according to @var{config}."
|
2022-11-11 12:56:35 -05:00
|
|
|
|
(define config-file
|
|
|
|
|
(elogind-configuration-file config))
|
|
|
|
|
|
2017-07-11 04:54:12 -04:00
|
|
|
|
(list (shepherd-service
|
|
|
|
|
(requirement '(dbus-system))
|
|
|
|
|
(provision '(elogind))
|
|
|
|
|
(start #~(make-forkexec-constructor
|
|
|
|
|
(list #$(file-append (elogind-package config)
|
|
|
|
|
"/libexec/elogind/elogind"))
|
|
|
|
|
#:environment-variables
|
|
|
|
|
(list (string-append "ELOGIND_CONF_FILE="
|
2022-11-11 12:56:35 -05:00
|
|
|
|
#$config-file))))
|
|
|
|
|
(stop #~(make-kill-destructor))
|
|
|
|
|
(actions (list (shepherd-configuration-action config-file))))))
|
2017-07-11 04:54:12 -04:00
|
|
|
|
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
(define elogind-service-type
|
|
|
|
|
(service-type (name 'elogind)
|
|
|
|
|
(extensions
|
2016-03-06 18:01:03 -05:00
|
|
|
|
(list (service-extension dbus-root-service-type
|
|
|
|
|
elogind-dbus-service)
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
(service-extension udev-service-type
|
|
|
|
|
(compose list elogind-package))
|
2015-11-01 11:19:33 -05:00
|
|
|
|
(service-extension polkit-service-type
|
|
|
|
|
(compose list elogind-package))
|
2016-02-05 10:49:05 -05:00
|
|
|
|
|
2017-07-11 04:54:12 -04:00
|
|
|
|
;; Start elogind from the Shepherd rather than waiting
|
|
|
|
|
;; for bus activation. This ensures that it can handle
|
|
|
|
|
;; events like lid close, etc.
|
|
|
|
|
(service-extension shepherd-root-service-type
|
|
|
|
|
elogind-shepherd-service)
|
|
|
|
|
|
2016-02-05 10:49:05 -05:00
|
|
|
|
;; Provide the 'loginctl' command.
|
|
|
|
|
(service-extension profile-service-type
|
|
|
|
|
(compose list elogind-package))
|
|
|
|
|
|
2016-02-06 05:57:54 -05:00
|
|
|
|
;; Extend PAM with pam_elogind.so.
|
|
|
|
|
(service-extension pam-root-service-type
|
2016-09-01 08:00:39 -04:00
|
|
|
|
pam-extension-procedure)
|
|
|
|
|
|
|
|
|
|
;; We need /run/user, /run/systemd, etc.
|
|
|
|
|
(service-extension file-system-service-type
|
2017-09-07 17:52:59 -04:00
|
|
|
|
(const %elogind-file-systems))))
|
2022-04-29 06:24:20 -04:00
|
|
|
|
(default-value (elogind-configuration))
|
|
|
|
|
(description "Run the @command{elogind} login and seat
|
|
|
|
|
management service. The @command{elogind} service integrates with PAM to
|
|
|
|
|
allow other system components to know the set of logged-in users as well as
|
|
|
|
|
their session types (graphical, console, remote, etc.). It can also clean up
|
|
|
|
|
after users when they log out.")))
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
|
2023-02-25 13:58:01 -05:00
|
|
|
|
(define-deprecated (elogind-service #:key (config (elogind-configuration)))
|
|
|
|
|
elogind-service-type
|
2015-08-18 05:56:17 -04:00
|
|
|
|
"Return a service that runs the @command{elogind} login and seat management
|
|
|
|
|
service. The @command{elogind} service integrates with PAM to allow other
|
|
|
|
|
system components to know the set of logged-in users as well as their session
|
|
|
|
|
types (graphical, console, remote, etc.). It can also clean up after users
|
|
|
|
|
when they log out."
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
(service elogind-service-type config))
|
2015-08-18 05:56:17 -04:00
|
|
|
|
|
2017-08-22 08:20:48 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
2020-03-18 06:38:15 -04:00
|
|
|
|
;;; Fontconfig and other desktop file-systems.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define %fontconfig-file-system
|
|
|
|
|
(file-system
|
|
|
|
|
(device "none")
|
|
|
|
|
(mount-point "/var/cache/fontconfig")
|
|
|
|
|
(type "tmpfs")
|
|
|
|
|
(flags '(read-only))
|
|
|
|
|
(check? #f)))
|
|
|
|
|
|
2022-09-16 14:45:15 -04:00
|
|
|
|
(define %gdm-file-system
|
|
|
|
|
(file-system
|
|
|
|
|
(device "none")
|
|
|
|
|
(mount-point "/var/lib/gdm")
|
|
|
|
|
(type "tmpfs")
|
|
|
|
|
(check? #f)))
|
|
|
|
|
|
2020-03-18 06:38:15 -04:00
|
|
|
|
;; The global fontconfig cache directory can sometimes contain stale entries,
|
|
|
|
|
;; possibly referencing fonts that have been GC'd, so mount it read-only.
|
|
|
|
|
;; As mentioned https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36924#8 and
|
|
|
|
|
;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=38046#10 and elsewhere.
|
|
|
|
|
(define fontconfig-file-system-service
|
|
|
|
|
(simple-service 'fontconfig-file-system
|
|
|
|
|
file-system-service-type
|
|
|
|
|
(list %fontconfig-file-system)))
|
2022-09-16 14:45:15 -04:00
|
|
|
|
|
|
|
|
|
;; Avoid stale caches and stale user IDs being reused between system
|
|
|
|
|
;; reconfigurations, which would crash GDM and render the system unusable.
|
|
|
|
|
;; GDM doesn't require persisting anything valuable there anyway.
|
|
|
|
|
(define gdm-file-system-service
|
|
|
|
|
(simple-service 'gdm-file-system
|
|
|
|
|
file-system-service-type
|
|
|
|
|
(list %gdm-file-system)))
|
|
|
|
|
|
2020-03-18 06:38:15 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
2017-08-22 08:20:48 -04:00
|
|
|
|
;;; AccountsService service.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define %accountsservice-activation
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
|
(mkdir-p "/var/lib/AccountsService")))
|
|
|
|
|
|
|
|
|
|
(define accountsservice-service-type
|
|
|
|
|
(service-type (name 'accountsservice)
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension activation-service-type
|
|
|
|
|
(const %accountsservice-activation))
|
|
|
|
|
(service-extension dbus-root-service-type list)
|
2020-08-18 15:12:12 -04:00
|
|
|
|
(service-extension polkit-service-type list)))
|
2022-04-29 06:24:20 -04:00
|
|
|
|
(default-value accountsservice)
|
|
|
|
|
(description "Run AccountsService, a system service available
|
|
|
|
|
over D-Bus that can list available accounts, change their passwords, and so
|
|
|
|
|
on. AccountsService integrates with PolicyKit to enable unprivileged users to
|
|
|
|
|
acquire the capability to modify their system configuration.")))
|
2017-08-22 08:20:48 -04:00
|
|
|
|
|
2023-02-25 13:58:03 -05:00
|
|
|
|
(define-deprecated
|
|
|
|
|
(accountsservice-service #:key (accountsservice accountsservice))
|
|
|
|
|
accountsservice-service-type
|
2017-08-22 08:20:48 -04:00
|
|
|
|
"Return a service that runs AccountsService, a system service that
|
|
|
|
|
can list available accounts, change their passwords, and so on.
|
|
|
|
|
AccountsService integrates with PolicyKit to enable unprivileged users to
|
|
|
|
|
acquire the capability to modify their system configuration.
|
|
|
|
|
@uref{https://www.freedesktop.org/wiki/Software/AccountsService/, the
|
|
|
|
|
accountsservice web site} for more information."
|
|
|
|
|
(service accountsservice-service-type accountsservice))
|
|
|
|
|
|
2019-01-29 05:03:12 -05:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; cups-pk-helper service.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define cups-pk-helper-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'cups-pk-helper)
|
|
|
|
|
(description
|
|
|
|
|
"PolicyKit helper to configure CUPS with fine-grained privileges.")
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension dbus-root-service-type list)
|
|
|
|
|
(service-extension polkit-service-type list)))
|
|
|
|
|
(default-value cups-pk-helper)))
|
|
|
|
|
|
2020-01-21 08:26:41 -05:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Scanner access via SANE.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define %sane-accounts
|
|
|
|
|
;; The '60-libsane.rules' udev rules refers to the "scanner" group.
|
|
|
|
|
(list (user-group (name "scanner") (system? #t))))
|
|
|
|
|
|
|
|
|
|
(define sane-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'sane)
|
|
|
|
|
(description
|
|
|
|
|
"This service provides access to scanners @i{via}
|
|
|
|
|
@uref{http://www.sane-project.org, SANE} by installing the necessary udev
|
|
|
|
|
rules.")
|
|
|
|
|
(default-value sane-backends-minimal)
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension udev-service-type list)
|
|
|
|
|
(service-extension account-service-type
|
|
|
|
|
(const %sane-accounts))))))
|
|
|
|
|
|
|
|
|
|
|
2016-02-24 17:08:58 -05:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNOME desktop service.
|
|
|
|
|
;;;
|
|
|
|
|
|
2024-01-25 10:35:17 -05:00
|
|
|
|
(define-maybe/no-serialization package)
|
|
|
|
|
|
|
|
|
|
(define (extract-propagated-inputs package)
|
|
|
|
|
;; Drop input labels. Attempt to support outputs.
|
|
|
|
|
(map
|
|
|
|
|
(match-lambda
|
|
|
|
|
((_ (? package? pkg)) pkg)
|
|
|
|
|
((_ (? package? pkg) output) (list pkg output)))
|
|
|
|
|
(package-propagated-inputs package)))
|
|
|
|
|
|
|
|
|
|
(define-configuration/no-serialization gnome-desktop-configuration
|
|
|
|
|
(core-services
|
|
|
|
|
(list-of-packages (extract-propagated-inputs gnome-meta-core-services))
|
|
|
|
|
"A list of packages that the GNOME Shell and applications may rely on.")
|
|
|
|
|
(shell
|
|
|
|
|
(list-of-packages (extract-propagated-inputs gnome-meta-core-shell))
|
|
|
|
|
"A list of packages that constitute the GNOME Shell, without applications.")
|
|
|
|
|
(utilities
|
|
|
|
|
(list-of-packages (extract-propagated-inputs gnome-meta-core-utilities))
|
|
|
|
|
"A list of packages that serve as applications to use on top of the \
|
|
|
|
|
GNOME Shell.")
|
|
|
|
|
(gnome (maybe-package) "Deprecated. Do not use.")
|
|
|
|
|
(extra-packages
|
|
|
|
|
(list-of-packages (extract-propagated-inputs gnome-essential-extras))
|
|
|
|
|
"A list of GNOME-adjacent packages to also include. This field is intended
|
|
|
|
|
for users to add their own packages to their GNOME experience. Note, that it
|
|
|
|
|
already includes some packages that are considered essential by some (most?)
|
2024-02-05 12:05:41 -05:00
|
|
|
|
GNOME users.")
|
|
|
|
|
(udev-ignorelist
|
|
|
|
|
(list-of-strings '())
|
|
|
|
|
"A list of regular expressions denoting udev rules or hardware file names
|
|
|
|
|
provided by any package that should not be installed. By default, every udev
|
|
|
|
|
rule and hardware file specified by any package referenced in the other fields
|
2024-02-16 07:08:11 -05:00
|
|
|
|
are installed.")
|
|
|
|
|
(polkit-ignorelist
|
|
|
|
|
(list-of-strings '())
|
|
|
|
|
"A list of regular expressions denoting polkit rules provided by any package
|
|
|
|
|
that should not be installed. By default, every polkit rule added by any package
|
|
|
|
|
referenced in the other fields are installed."))
|
2016-02-24 17:08:58 -05:00
|
|
|
|
|
2023-02-17 09:16:17 -05:00
|
|
|
|
(define (gnome-package gnome name)
|
|
|
|
|
"Return the package NAME among the GNOME package inputs. NAME can be a
|
|
|
|
|
single name or a tree-like, e.g. @code{'(\"gnome-boxes\" \"spice-gtk\")} to
|
|
|
|
|
denote the spice-gtk input of the gnome-boxes input of the GNOME meta-package."
|
|
|
|
|
((package-direct-input-selector name) gnome))
|
|
|
|
|
|
|
|
|
|
(define (gnome-packages gnome names)
|
|
|
|
|
"Return the package NAMES among the GNOME package inputs."
|
|
|
|
|
(map (cut gnome-package gnome <>) names))
|
2022-01-03 14:22:02 -05:00
|
|
|
|
|
2024-02-05 12:05:41 -05:00
|
|
|
|
(define (gnome-udev-configuration-files config)
|
|
|
|
|
"Return the GNOME udev rules and hardware files as computed from its
|
|
|
|
|
dependencies by filtering out the ignorelist."
|
|
|
|
|
(list
|
|
|
|
|
(computed-file
|
|
|
|
|
"gnome-udev-configurations"
|
|
|
|
|
(with-imported-modules
|
|
|
|
|
(source-module-closure '((guix build utils)
|
|
|
|
|
(guix build union)))
|
|
|
|
|
#~(begin
|
|
|
|
|
(use-modules (guix build utils)
|
|
|
|
|
(guix build union))
|
|
|
|
|
;; If rules.d or hwdb.d is not a proper directory but a symlink,
|
|
|
|
|
;; then it will not be possible to delete individual files in this
|
|
|
|
|
;; directory.
|
|
|
|
|
(union-build #$output
|
|
|
|
|
(search-path-as-list
|
|
|
|
|
(list "lib/udev" "libexec/udev")
|
|
|
|
|
(list #$@(gnome-profile config)))
|
|
|
|
|
#:create-all-directories? #t)
|
|
|
|
|
(for-each
|
|
|
|
|
(lambda (pattern)
|
|
|
|
|
(for-each
|
|
|
|
|
delete-file-recursively
|
|
|
|
|
(find-files #$output pattern)))
|
|
|
|
|
(list #$@(gnome-desktop-configuration-udev-ignorelist config))))))))
|
2022-01-03 14:22:02 -05:00
|
|
|
|
|
|
|
|
|
(define (gnome-polkit-settings config)
|
|
|
|
|
"Return the list of GNOME dependencies that provide polkit actions and
|
|
|
|
|
rules."
|
2024-02-16 07:08:11 -05:00
|
|
|
|
(list
|
|
|
|
|
(computed-file
|
|
|
|
|
"gnome-polkit-settings"
|
|
|
|
|
(with-imported-modules
|
|
|
|
|
(source-module-closure '((guix build utils)
|
|
|
|
|
(guix build union)))
|
|
|
|
|
#~(let ((output (string-append #$output "/share/polkit-1")))
|
|
|
|
|
(use-modules (guix build utils)
|
|
|
|
|
(guix build union))
|
|
|
|
|
(mkdir-p (dirname output))
|
|
|
|
|
(union-build output
|
|
|
|
|
(search-path-as-list
|
|
|
|
|
(list "share/polkit-1")
|
|
|
|
|
(list #$@(gnome-profile config)))
|
|
|
|
|
#:create-all-directories? #t)
|
|
|
|
|
(for-each
|
|
|
|
|
(lambda (pattern)
|
|
|
|
|
(for-each
|
|
|
|
|
delete-file-recursively
|
|
|
|
|
(find-files output pattern)))
|
|
|
|
|
(list #$@(gnome-desktop-configuration-polkit-ignorelist config))))))))
|
2024-01-25 10:35:17 -05:00
|
|
|
|
|
|
|
|
|
(define (gnome-profile config)
|
|
|
|
|
"Return a list of packages propagated through CONFIG."
|
|
|
|
|
(append
|
|
|
|
|
(gnome-desktop-configuration-core-services config)
|
|
|
|
|
(gnome-desktop-configuration-shell config)
|
|
|
|
|
(gnome-desktop-configuration-utilities config)
|
|
|
|
|
(let ((gnome-meta (gnome-desktop-configuration-gnome config)))
|
|
|
|
|
(if (maybe-value-set? gnome-meta)
|
|
|
|
|
(begin
|
|
|
|
|
(warning
|
|
|
|
|
(gnome-desktop-configuration-source-location config)
|
|
|
|
|
(G_ "Using a meta-package for gnome-desktop is discouraged.~%"))
|
|
|
|
|
(list gnome-meta))
|
|
|
|
|
(list)))
|
|
|
|
|
(gnome-desktop-configuration-extra-packages config)))
|
2023-02-17 00:41:15 -05:00
|
|
|
|
|
2016-02-24 17:08:58 -05:00
|
|
|
|
(define gnome-desktop-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'gnome-desktop)
|
|
|
|
|
(extensions
|
2022-01-03 14:22:02 -05:00
|
|
|
|
(list (service-extension udev-service-type
|
2024-02-05 12:05:41 -05:00
|
|
|
|
gnome-udev-configuration-files)
|
2022-01-03 14:22:02 -05:00
|
|
|
|
(service-extension polkit-service-type
|
2017-10-11 16:21:50 -04:00
|
|
|
|
gnome-polkit-settings)
|
2016-02-24 17:08:58 -05:00
|
|
|
|
(service-extension profile-service-type
|
2024-01-25 10:35:17 -05:00
|
|
|
|
gnome-profile)))
|
2019-03-27 05:14:11 -04:00
|
|
|
|
(default-value (gnome-desktop-configuration))
|
2018-05-24 04:15:27 -04:00
|
|
|
|
(description "Run the GNOME desktop environment.")))
|
2016-02-24 17:08:58 -05:00
|
|
|
|
|
2023-02-26 19:11:41 -05:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; MATE Desktop service.
|
|
|
|
|
;;; TODO: Add mate-screensaver.
|
2017-12-30 16:52:54 -05:00
|
|
|
|
|
|
|
|
|
(define-record-type* <mate-desktop-configuration> mate-desktop-configuration
|
|
|
|
|
make-mate-desktop-configuration
|
2019-10-22 11:29:35 -04:00
|
|
|
|
mate-desktop-configuration?
|
2017-12-30 16:52:54 -05:00
|
|
|
|
(mate-package mate-package (default mate)))
|
|
|
|
|
|
2020-04-02 10:04:12 -04:00
|
|
|
|
(define (mate-polkit-extension config)
|
|
|
|
|
"Return the list of packages for CONFIG's MATE package that extend polkit."
|
|
|
|
|
(let ((mate (mate-package config)))
|
|
|
|
|
(map (lambda (input)
|
|
|
|
|
((package-direct-input-selector input) mate))
|
|
|
|
|
'("mate-system-monitor" ;kill, renice processes
|
|
|
|
|
"mate-settings-daemon" ;date/time settings
|
|
|
|
|
"mate-power-manager" ;modify brightness
|
|
|
|
|
"mate-control-center" ;RandR, display properties FIXME
|
|
|
|
|
"mate-applets")))) ;CPU frequency scaling
|
|
|
|
|
|
2017-12-30 16:52:54 -05:00
|
|
|
|
(define mate-desktop-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'mate-desktop)
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension polkit-service-type
|
2020-04-02 10:04:12 -04:00
|
|
|
|
mate-polkit-extension)
|
2017-12-30 16:52:54 -05:00
|
|
|
|
(service-extension profile-service-type
|
|
|
|
|
(compose list
|
2018-05-24 04:15:51 -04:00
|
|
|
|
mate-package))))
|
2019-03-11 09:06:39 -04:00
|
|
|
|
(default-value (mate-desktop-configuration))
|
2018-05-24 04:15:51 -04:00
|
|
|
|
(description "Run the MATE desktop environment.")))
|
2017-12-30 16:52:54 -05:00
|
|
|
|
|
2016-02-24 17:08:58 -05:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; XFCE desktop service.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-record-type* <xfce-desktop-configuration> xfce-desktop-configuration
|
|
|
|
|
make-xfce-desktop-configuration
|
2019-10-22 11:29:35 -04:00
|
|
|
|
xfce-desktop-configuration?
|
2016-02-24 17:08:58 -05:00
|
|
|
|
(xfce xfce-package (default xfce)))
|
|
|
|
|
|
2019-10-15 08:17:54 -04:00
|
|
|
|
(define (xfce-polkit-settings config)
|
|
|
|
|
"Return the list of XFCE dependencies that provide polkit actions and
|
|
|
|
|
rules."
|
|
|
|
|
(let ((xfce (xfce-package config)))
|
|
|
|
|
(map (lambda (name)
|
|
|
|
|
((package-direct-input-selector name) xfce))
|
|
|
|
|
'("thunar"
|
|
|
|
|
"xfce4-power-manager"))))
|
|
|
|
|
|
2016-02-24 17:08:58 -05:00
|
|
|
|
(define xfce-desktop-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'xfce-desktop)
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension polkit-service-type
|
2019-10-15 08:17:54 -04:00
|
|
|
|
xfce-polkit-settings)
|
2016-02-24 17:08:58 -05:00
|
|
|
|
(service-extension profile-service-type
|
2019-03-27 05:41:14 -04:00
|
|
|
|
(compose list xfce-package))))
|
|
|
|
|
(default-value (xfce-desktop-configuration))
|
|
|
|
|
(description "Run the Xfce desktop environment.")))
|
2016-02-24 17:08:58 -05:00
|
|
|
|
|
2023-02-26 19:11:43 -05:00
|
|
|
|
|
2020-10-19 16:58:49 -04:00
|
|
|
|
;;;
|
|
|
|
|
;;; Lxqt desktop service.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-record-type* <lxqt-desktop-configuration> lxqt-desktop-configuration
|
|
|
|
|
make-lxqt-desktop-configuration
|
|
|
|
|
lxqt-desktop-configuration?
|
|
|
|
|
(lxqt lxqt-package
|
|
|
|
|
(default lxqt)))
|
|
|
|
|
|
|
|
|
|
(define (lxqt-polkit-settings config)
|
|
|
|
|
"Return the list of LXQt dependencies that provide polkit actions and
|
|
|
|
|
rules."
|
|
|
|
|
(let ((lxqt (lxqt-package config)))
|
|
|
|
|
(map (lambda (name)
|
|
|
|
|
((package-direct-input-selector name) lxqt))
|
|
|
|
|
'("lxqt-admin"))))
|
|
|
|
|
|
|
|
|
|
(define lxqt-desktop-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'lxqt-desktop)
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension polkit-service-type
|
|
|
|
|
lxqt-polkit-settings)
|
|
|
|
|
(service-extension profile-service-type
|
|
|
|
|
(compose list lxqt-package))))
|
|
|
|
|
(default-value (lxqt-desktop-configuration))
|
|
|
|
|
(description "Run LXQt desktop environment.")))
|
|
|
|
|
|
2023-02-28 12:11:08 -05:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Sugar desktop service.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-record-type* <sugar-desktop-configuration> sugar-desktop-configuration
|
|
|
|
|
make-sugar-desktop-configuration
|
|
|
|
|
sugar-desktop-configuration?
|
2023-02-28 17:14:23 -05:00
|
|
|
|
(sugar sugar-package (default sugar))
|
|
|
|
|
(gobject-introspection
|
|
|
|
|
sugar-gobject-introspection (default gobject-introspection))
|
|
|
|
|
(activities
|
|
|
|
|
sugar-activities (default (list sugar-help-activity))))
|
2023-02-28 12:11:08 -05:00
|
|
|
|
|
|
|
|
|
(define (sugar-polkit-settings config)
|
|
|
|
|
"Return the list of packages that provide polkit actions and rules."
|
|
|
|
|
(list (sugar-package config)))
|
|
|
|
|
|
|
|
|
|
(define sugar-desktop-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'sugar-desktop)
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension polkit-service-type
|
|
|
|
|
sugar-polkit-settings)
|
|
|
|
|
(service-extension profile-service-type
|
2023-02-28 17:14:23 -05:00
|
|
|
|
(lambda (config)
|
|
|
|
|
(cons* (sugar-package config)
|
|
|
|
|
(sugar-gobject-introspection config)
|
|
|
|
|
(sugar-activities config))))))
|
2023-02-28 12:11:08 -05:00
|
|
|
|
(default-value (sugar-desktop-configuration))
|
|
|
|
|
(description "Run the Sugar desktop environment.")))
|
|
|
|
|
|
2018-03-31 08:34:50 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; X11 socket directory service
|
|
|
|
|
;;;
|
|
|
|
|
|
2023-03-06 07:35:01 -05:00
|
|
|
|
(define x11-socket-directory-service-type
|
|
|
|
|
(let ((x11-socket-directory-shepherd-service
|
|
|
|
|
(shepherd-service
|
|
|
|
|
(documentation "Create @file{/tmp/.X11-unix} for XWayland.")
|
|
|
|
|
(requirement '(file-systems))
|
|
|
|
|
(provision '(x11-socket-directory))
|
|
|
|
|
(one-shot? #t)
|
|
|
|
|
(start #~(lambda _
|
|
|
|
|
(let ((directory "/tmp/.X11-unix"))
|
|
|
|
|
(mkdir-p directory)
|
|
|
|
|
(chmod directory #o1777)))))))
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'x11-socket-directory-service)
|
|
|
|
|
(extensions
|
|
|
|
|
(list
|
|
|
|
|
(service-extension shepherd-root-service-type
|
|
|
|
|
(compose
|
|
|
|
|
list
|
|
|
|
|
(const x11-socket-directory-shepherd-service)))))
|
|
|
|
|
(default-value #f) ; no default value required
|
|
|
|
|
(description
|
|
|
|
|
"Create @file{/tmp/.X11-unix} for XWayland. When using X11, libxcb
|
|
|
|
|
takes care of creating that directory however, when using XWayland, we
|
|
|
|
|
need to create it beforehand."))))
|
|
|
|
|
|
|
|
|
|
(define-deprecated x11-socket-directory-service
|
|
|
|
|
x11-socket-directory-service-type
|
2018-03-31 08:34:50 -04:00
|
|
|
|
;; Return a service that creates /tmp/.X11-unix. When using X11, libxcb
|
|
|
|
|
;; takes care of creating that directory. However, when using XWayland, we
|
|
|
|
|
;; need to create beforehand. Thus, create it unconditionally here.
|
2023-03-06 07:35:01 -05:00
|
|
|
|
(service x11-socket-directory-service-type))
|
|
|
|
|
|
2018-03-10 15:24:00 -05:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; Enlightenment desktop service.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-record-type* <enlightenment-desktop-configuration>
|
|
|
|
|
enlightenment-desktop-configuration make-enlightenment-desktop-configuration
|
|
|
|
|
enlightenment-desktop-configuration?
|
|
|
|
|
;; <package>
|
|
|
|
|
(enlightenment enlightenment-package
|
|
|
|
|
(default enlightenment)))
|
|
|
|
|
|
2024-08-17 20:00:00 -04:00
|
|
|
|
(define (enlightenment-privileged-programs enlightenment-desktop-configuration)
|
2018-03-10 15:24:00 -05:00
|
|
|
|
(match-record enlightenment-desktop-configuration
|
2021-07-06 16:03:20 -04:00
|
|
|
|
<enlightenment-desktop-configuration>
|
|
|
|
|
(enlightenment)
|
2024-08-31 20:00:00 -04:00
|
|
|
|
(map file-like->setuid-program
|
2021-07-06 16:03:20 -04:00
|
|
|
|
(list (file-append enlightenment
|
|
|
|
|
"/lib/enlightenment/utils/enlightenment_sys")
|
|
|
|
|
(file-append enlightenment
|
|
|
|
|
"/lib/enlightenment/utils/enlightenment_system")
|
|
|
|
|
(file-append enlightenment
|
|
|
|
|
"/lib/enlightenment/utils/enlightenment_ckpasswd")))))
|
2018-03-10 15:24:00 -05:00
|
|
|
|
|
|
|
|
|
(define enlightenment-desktop-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'enlightenment-desktop)
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension dbus-root-service-type
|
|
|
|
|
(compose list
|
|
|
|
|
(package-direct-input-selector
|
|
|
|
|
"efl")
|
|
|
|
|
enlightenment-package))
|
2022-12-29 02:15:42 -05:00
|
|
|
|
(service-extension udev-service-type
|
|
|
|
|
(compose list
|
|
|
|
|
(package-direct-input-selector
|
|
|
|
|
"ddcutil")
|
|
|
|
|
enlightenment-package))
|
2024-08-17 20:00:00 -04:00
|
|
|
|
(service-extension privileged-program-service-type
|
|
|
|
|
enlightenment-privileged-programs)
|
2018-03-10 15:24:00 -05:00
|
|
|
|
(service-extension profile-service-type
|
|
|
|
|
(compose list
|
|
|
|
|
enlightenment-package))))
|
|
|
|
|
(default-value (enlightenment-desktop-configuration))
|
|
|
|
|
(description
|
|
|
|
|
"Return a service that adds the @code{enlightenment} package to the system
|
|
|
|
|
profile, and extends dbus with the ability for @code{efl} to generate
|
2024-08-17 20:00:00 -04:00
|
|
|
|
thumbnails and privileges the programs which enlightenment needs to function
|
2018-03-10 15:24:00 -05:00
|
|
|
|
as expected.")))
|
2018-03-31 08:34:50 -04:00
|
|
|
|
|
2017-07-31 07:04:22 -04:00
|
|
|
|
;;;
|
|
|
|
|
;;; KDE Plasma desktop service.
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-record-type* <plasma-desktop-configuration> plasma-desktop-configuration
|
|
|
|
|
make-plasma-desktop-configuration
|
|
|
|
|
plasma-desktop-configuration?
|
|
|
|
|
(plasma-package plasma-package (default plasma)))
|
|
|
|
|
|
|
|
|
|
(define (plasma-polkit-settings config)
|
|
|
|
|
"Return the list of KDE Plasma dependencies that provide polkit actions and
|
|
|
|
|
rules."
|
|
|
|
|
(let ((plasma-plasma (plasma-package config)))
|
|
|
|
|
(map (lambda (name)
|
|
|
|
|
((package-direct-input-selector name) plasma-plasma))
|
|
|
|
|
'("plasma-desktop"
|
|
|
|
|
"plasma-workspace"
|
|
|
|
|
"plasma-disks"
|
|
|
|
|
"kinfocenter"
|
|
|
|
|
"libksysguard"
|
|
|
|
|
"ktexteditor"
|
|
|
|
|
"powerdevil"
|
|
|
|
|
"plasma-firewall"))))
|
|
|
|
|
|
2024-07-09 10:42:52 -04:00
|
|
|
|
(define (plasma-dbus-service config)
|
|
|
|
|
"Return the list of KDE Plasma dependencies that provide D-Bus services."
|
|
|
|
|
(let ((plasma-plasma (plasma-package config)))
|
|
|
|
|
(map (lambda (name)
|
|
|
|
|
((package-direct-input-selector name) plasma-plasma))
|
|
|
|
|
'("plasma-desktop"
|
|
|
|
|
"plasma-workspace"
|
|
|
|
|
"kactivitymanagerd"
|
|
|
|
|
"plasma-disks"
|
|
|
|
|
"kinfocenter"
|
|
|
|
|
"libksysguard"
|
|
|
|
|
"ktexteditor"
|
|
|
|
|
"powerdevil"
|
2024-07-16 09:24:14 -04:00
|
|
|
|
"kwallet"
|
2024-07-09 10:42:52 -04:00
|
|
|
|
"plasma-firewall"))))
|
|
|
|
|
|
2017-07-31 07:04:22 -04:00
|
|
|
|
;; see https://bugs.kde.org/show_bug.cgi?id=456210
|
|
|
|
|
;; if `kde' no exits, fallback to `other', and then unlock lockscreen not work,
|
|
|
|
|
;; so add it.
|
|
|
|
|
(define (plasma-pam-services config)
|
|
|
|
|
(list (unix-pam-service "kde")))
|
|
|
|
|
|
|
|
|
|
(define plasma-desktop-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'plasma-desktop)
|
|
|
|
|
(description "Run the KDE Plasma desktop environment.")
|
|
|
|
|
(default-value (plasma-desktop-configuration))
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension polkit-service-type
|
|
|
|
|
plasma-polkit-settings)
|
2024-07-09 10:42:52 -04:00
|
|
|
|
(service-extension dbus-root-service-type
|
|
|
|
|
plasma-dbus-service)
|
2017-07-31 07:04:22 -04:00
|
|
|
|
(service-extension pam-root-service-type
|
|
|
|
|
plasma-pam-services)
|
|
|
|
|
(service-extension profile-service-type
|
|
|
|
|
(compose list
|
|
|
|
|
plasma-package))))))
|
|
|
|
|
|
2019-01-05 17:28:18 -05:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; inputattach-service-type
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-record-type* <inputattach-configuration>
|
|
|
|
|
inputattach-configuration
|
|
|
|
|
make-inputattach-configuration
|
|
|
|
|
inputattach-configuration?
|
|
|
|
|
(device-type inputattach-configuration-device-type
|
|
|
|
|
(default "wacom"))
|
|
|
|
|
(device inputattach-configuration-device
|
|
|
|
|
(default "/dev/ttyS0"))
|
2019-10-10 12:38:36 -04:00
|
|
|
|
(baud-rate inputattach-configuration-baud-rate
|
|
|
|
|
(default #f))
|
2019-01-05 17:28:18 -05:00
|
|
|
|
(log-file inputattach-configuration-log-file
|
|
|
|
|
(default #f)))
|
|
|
|
|
|
|
|
|
|
(define inputattach-shepherd-service
|
|
|
|
|
(match-lambda
|
2019-10-10 12:38:36 -04:00
|
|
|
|
(($ <inputattach-configuration> type device baud-rate log-file)
|
|
|
|
|
(let ((args (append (if baud-rate
|
2020-02-06 13:26:03 -05:00
|
|
|
|
(list "--baud" (number->string baud-rate))
|
2019-10-10 12:38:36 -04:00
|
|
|
|
'())
|
|
|
|
|
(list (string-append "--" type)
|
|
|
|
|
device))))
|
|
|
|
|
(list (shepherd-service
|
|
|
|
|
(provision '(inputattach))
|
|
|
|
|
(requirement '(udev))
|
|
|
|
|
(documentation "inputattach daemon")
|
|
|
|
|
(start #~(make-forkexec-constructor
|
|
|
|
|
(cons (string-append #$inputattach
|
|
|
|
|
"/bin/inputattach")
|
|
|
|
|
(quote #$args))
|
|
|
|
|
#:log-file #$log-file))
|
|
|
|
|
(stop #~(make-kill-destructor))))))))
|
2019-01-05 17:28:18 -05:00
|
|
|
|
|
|
|
|
|
(define inputattach-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'inputattach)
|
|
|
|
|
(extensions
|
|
|
|
|
(list (service-extension shepherd-root-service-type
|
|
|
|
|
inputattach-shepherd-service)))
|
|
|
|
|
(default-value (inputattach-configuration))
|
|
|
|
|
(description "Return a service that runs inputattach on a device and
|
|
|
|
|
dispatches events from it.")))
|
|
|
|
|
|
2019-11-23 13:51:15 -05:00
|
|
|
|
|
|
|
|
|
;;;
|
2019-11-09 10:14:45 -05:00
|
|
|
|
;;; gnome-keyring-service-type
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define-record-type* <gnome-keyring-configuration> gnome-keyring-configuration
|
|
|
|
|
make-gnome-keyring-configuration
|
|
|
|
|
gnome-keyring-configuration?
|
|
|
|
|
(keyring gnome-keyring-package (default gnome-keyring))
|
|
|
|
|
(pam-services gnome-keyring-pam-services (default '(("gdm-password" . login)
|
|
|
|
|
("passwd" . passwd)))))
|
|
|
|
|
|
|
|
|
|
(define (pam-gnome-keyring config)
|
|
|
|
|
(define (%pam-keyring-entry . arguments)
|
|
|
|
|
(pam-entry
|
|
|
|
|
(control "optional")
|
|
|
|
|
(module (file-append (gnome-keyring-package config)
|
|
|
|
|
"/lib/security/pam_gnome_keyring.so"))
|
|
|
|
|
(arguments arguments)))
|
|
|
|
|
|
|
|
|
|
(list
|
2023-05-09 12:45:07 -04:00
|
|
|
|
(pam-extension
|
|
|
|
|
(transformer
|
|
|
|
|
(lambda (service)
|
|
|
|
|
(case (assoc-ref (gnome-keyring-pam-services config)
|
|
|
|
|
(pam-service-name service))
|
|
|
|
|
((login)
|
|
|
|
|
(pam-service
|
|
|
|
|
(inherit service)
|
|
|
|
|
(auth (append (pam-service-auth service)
|
|
|
|
|
(list (%pam-keyring-entry))))
|
|
|
|
|
(session (append (pam-service-session service)
|
|
|
|
|
(list (%pam-keyring-entry "auto_start"))))))
|
|
|
|
|
((passwd)
|
|
|
|
|
(pam-service
|
|
|
|
|
(inherit service)
|
|
|
|
|
(password (append (pam-service-password service)
|
|
|
|
|
(list (%pam-keyring-entry))))))
|
|
|
|
|
(else service)))))))
|
2019-11-09 10:14:45 -05:00
|
|
|
|
|
|
|
|
|
(define gnome-keyring-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'gnome-keyring)
|
|
|
|
|
(extensions (list
|
|
|
|
|
(service-extension pam-root-service-type pam-gnome-keyring)))
|
|
|
|
|
(default-value (gnome-keyring-configuration))
|
|
|
|
|
(description "Return a service, that adds the @code{gnome-keyring} package
|
|
|
|
|
to the system profile and extends PAM with entries using
|
|
|
|
|
@code{pam_gnome_keyring.so}, unlocking a user's login keyring when they log in
|
|
|
|
|
or setting its password with passwd.")))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;
|
2019-11-23 13:51:15 -05:00
|
|
|
|
;;; polkit-wheel-service -- Allow wheel group to perform admin actions
|
|
|
|
|
;;;
|
|
|
|
|
|
|
|
|
|
(define polkit-wheel
|
|
|
|
|
(file-union
|
|
|
|
|
"polkit-wheel"
|
|
|
|
|
`(("share/polkit-1/rules.d/wheel.rules"
|
|
|
|
|
,(plain-file
|
|
|
|
|
"wheel.rules"
|
|
|
|
|
"polkit.addAdminRule(function(action, subject) {
|
|
|
|
|
return [\"unix-group:wheel\"];
|
|
|
|
|
});
|
|
|
|
|
")))))
|
|
|
|
|
|
|
|
|
|
(define polkit-wheel-service
|
|
|
|
|
(simple-service 'polkit-wheel polkit-service-type (list polkit-wheel)))
|
|
|
|
|
|
2022-06-15 05:17:41 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; seatd-service-type -- minimal seat management daemon
|
|
|
|
|
;;;
|
|
|
|
|
|
2022-07-22 00:09:54 -04:00
|
|
|
|
(define (seatd-group-sanitizer group-or-name)
|
|
|
|
|
(match group-or-name
|
|
|
|
|
((? user-group? group) group)
|
|
|
|
|
((? string? group-name) (user-group (name group-name) (system? #t)))
|
|
|
|
|
(_ (leave (G_ "seatd: '~a' is not a valid group~%") group-or-name))))
|
|
|
|
|
|
2022-06-15 05:17:41 -04:00
|
|
|
|
(define-record-type* <seatd-configuration> seatd-configuration
|
|
|
|
|
make-seatd-configuration
|
|
|
|
|
seatd-configuration?
|
|
|
|
|
(seatd seatd-package (default seatd))
|
2022-07-22 00:09:54 -04:00
|
|
|
|
(group seatd-group ; string | <user-group>
|
|
|
|
|
(default "seat")
|
|
|
|
|
(sanitize seatd-group-sanitizer))
|
2022-06-15 05:17:41 -04:00
|
|
|
|
(socket seatd-socket (default "/run/seatd.sock"))
|
|
|
|
|
(logfile seatd-logfile (default "/var/log/seatd.log"))
|
|
|
|
|
(loglevel seatd-loglevel (default "info")))
|
|
|
|
|
|
|
|
|
|
(define (seatd-shepherd-service config)
|
|
|
|
|
(list (shepherd-service
|
|
|
|
|
(documentation "Minimal seat management daemon")
|
|
|
|
|
(requirement '())
|
|
|
|
|
;; TODO: once cgroups is separate dependency
|
|
|
|
|
;; here we should depend on it rather than elogind
|
|
|
|
|
(provision '(seatd elogind))
|
|
|
|
|
(start #~(make-forkexec-constructor
|
|
|
|
|
(list #$(file-append (seatd-package config) "/bin/seatd")
|
2022-07-22 00:09:54 -04:00
|
|
|
|
"-g" #$(user-group-name (seatd-group config)))
|
2022-06-15 05:17:41 -04:00
|
|
|
|
#:environment-variables
|
|
|
|
|
(list (string-append "SEATD_LOGLEVEL="
|
|
|
|
|
#$(seatd-loglevel config))
|
|
|
|
|
(string-append "SEATD_DEFAULTPATH="
|
|
|
|
|
#$(seatd-socket config)))
|
|
|
|
|
#:log-file #$(seatd-logfile config)))
|
|
|
|
|
(stop #~(make-kill-destructor)))))
|
|
|
|
|
|
2022-07-22 00:09:54 -04:00
|
|
|
|
(define seatd-accounts
|
|
|
|
|
(match-lambda (($ <seatd-configuration> _ group) (list group))))
|
|
|
|
|
|
2022-06-15 05:17:41 -04:00
|
|
|
|
(define seatd-environment
|
|
|
|
|
(match-lambda
|
2022-07-22 00:09:54 -04:00
|
|
|
|
(($ <seatd-configuration> _ _ socket)
|
2022-06-15 05:17:41 -04:00
|
|
|
|
`(("SEATD_SOCK" . ,socket)))))
|
|
|
|
|
|
|
|
|
|
(define seatd-service-type
|
|
|
|
|
(service-type
|
|
|
|
|
(name 'seatd)
|
|
|
|
|
(description "Seat management takes care of mediating access
|
|
|
|
|
to shared devices (graphics, input), without requiring the
|
|
|
|
|
applications needing access to be root.")
|
|
|
|
|
(extensions
|
|
|
|
|
(list
|
2022-07-22 00:09:54 -04:00
|
|
|
|
(service-extension account-service-type seatd-accounts)
|
2022-06-15 05:17:41 -04:00
|
|
|
|
(service-extension session-environment-service-type seatd-environment)
|
|
|
|
|
;; TODO: once cgroups is separate dependency we should not mount it here
|
|
|
|
|
;; for now it is mounted here, because elogind mounts it
|
|
|
|
|
(service-extension file-system-service-type (const %control-groups))
|
|
|
|
|
(service-extension shepherd-root-service-type seatd-shepherd-service)))
|
|
|
|
|
(default-value (seatd-configuration))))
|
|
|
|
|
|
2015-08-15 15:36:22 -04:00
|
|
|
|
|
|
|
|
|
;;;
|
|
|
|
|
;;; The default set of desktop services.
|
|
|
|
|
;;;
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
|
2021-12-08 09:41:00 -05:00
|
|
|
|
(define* (desktop-services-for-system #:optional
|
|
|
|
|
(system (or (%current-target-system)
|
|
|
|
|
(%current-system))))
|
2015-05-08 09:58:59 -04:00
|
|
|
|
;; List of services typically useful for a "desktop" use case.
|
2021-12-08 09:41:00 -05:00
|
|
|
|
|
|
|
|
|
;; Since GDM depends on Rust (gdm -> gnome-shell -> gjs -> mozjs -> rust)
|
|
|
|
|
;; and Rust is currently unavailable on non-x86_64 platforms, default to
|
|
|
|
|
;; SDDM there (FIXME).
|
|
|
|
|
(cons* (if (string-prefix? "x86_64" system)
|
|
|
|
|
(service gdm-service-type)
|
|
|
|
|
(service sddm-service-type))
|
2015-05-08 09:58:59 -04:00
|
|
|
|
|
2015-10-29 14:00:14 -04:00
|
|
|
|
;; Screen lockers are a pretty useful thing and these are small.
|
2023-03-06 12:26:44 -05:00
|
|
|
|
(service screen-locker-service-type
|
|
|
|
|
(screen-locker-configuration
|
2023-05-22 15:06:51 -04:00
|
|
|
|
(name "slock")
|
|
|
|
|
(program (file-append slock "/bin/slock"))))
|
2023-03-06 12:26:44 -05:00
|
|
|
|
(service screen-locker-service-type
|
|
|
|
|
(screen-locker-configuration
|
2023-05-22 15:06:51 -04:00
|
|
|
|
(name "xlock")
|
|
|
|
|
(program (file-append xlockmore "/bin/xlock"))))
|
2015-10-29 14:00:14 -04:00
|
|
|
|
|
2016-12-29 17:20:57 -05:00
|
|
|
|
;; Add udev rules for MTP devices so that non-root users can access
|
|
|
|
|
;; them.
|
|
|
|
|
(simple-service 'mtp udev-service-type (list libmtp))
|
2020-01-05 07:51:02 -05:00
|
|
|
|
;; Add udev rules for scanners.
|
2020-01-21 08:26:41 -05:00
|
|
|
|
(service sane-service-type)
|
2019-11-23 13:58:11 -05:00
|
|
|
|
;; Add polkit rules, so that non-root users in the wheel group can
|
|
|
|
|
;; perform administrative tasks (similar to "sudo").
|
|
|
|
|
polkit-wheel-service
|
2016-12-29 17:20:57 -05:00
|
|
|
|
|
2020-09-24 15:30:18 -04:00
|
|
|
|
;; Allow desktop users to also mount NTFS and NFS file systems
|
|
|
|
|
;; without root.
|
2024-09-07 20:00:00 -04:00
|
|
|
|
(simple-service 'mount-setuid-helpers privileged-program-service-type
|
|
|
|
|
(map file-like->setuid-program
|
2021-07-06 16:03:20 -04:00
|
|
|
|
(list (file-append nfs-utils "/sbin/mount.nfs")
|
|
|
|
|
(file-append ntfs-3g "/sbin/mount.ntfs-3g"))))
|
2020-09-24 15:30:18 -04:00
|
|
|
|
|
2022-09-16 14:45:15 -04:00
|
|
|
|
;; This is a volatile read-write file system mounted at /var/lib/gdm,
|
|
|
|
|
;; to avoid GDM stale cache and permission issues.
|
|
|
|
|
gdm-file-system-service
|
|
|
|
|
|
2020-03-18 06:38:15 -04:00
|
|
|
|
;; The global fontconfig cache directory can sometimes contain
|
|
|
|
|
;; stale entries, possibly referencing fonts that have been GC'd,
|
|
|
|
|
;; so mount it read-only.
|
|
|
|
|
fontconfig-file-system-service
|
|
|
|
|
|
2019-05-14 04:36:49 -04:00
|
|
|
|
;; NetworkManager and its applet.
|
2017-09-02 17:39:29 -04:00
|
|
|
|
(service network-manager-service-type)
|
|
|
|
|
(service wpa-supplicant-service-type) ;needed by NetworkManager
|
2019-05-14 04:36:49 -04:00
|
|
|
|
(simple-service 'network-manager-applet
|
|
|
|
|
profile-service-type
|
|
|
|
|
(list network-manager-applet))
|
2019-05-13 16:51:28 -04:00
|
|
|
|
(service modem-manager-service-type)
|
2019-06-12 05:16:57 -04:00
|
|
|
|
(service usb-modeswitch-service-type)
|
2019-05-14 04:36:49 -04:00
|
|
|
|
|
|
|
|
|
;; The D-Bus clique.
|
2019-01-16 05:18:34 -05:00
|
|
|
|
(service avahi-service-type)
|
2023-02-25 13:58:05 -05:00
|
|
|
|
(service udisks-service-type)
|
2019-01-29 10:14:15 -05:00
|
|
|
|
(service upower-service-type)
|
2023-02-25 13:58:03 -05:00
|
|
|
|
(service accountsservice-service-type)
|
2019-01-29 05:03:12 -05:00
|
|
|
|
(service cups-pk-helper-service-type)
|
2019-10-29 18:26:37 -04:00
|
|
|
|
(service colord-service-type)
|
2023-02-25 13:58:06 -05:00
|
|
|
|
(service geoclue-service-type)
|
2019-01-20 08:27:52 -05:00
|
|
|
|
(service polkit-service-type)
|
2023-02-25 13:58:01 -05:00
|
|
|
|
(service elogind-service-type)
|
2023-02-25 13:58:13 -05:00
|
|
|
|
(service dbus-root-service-type)
|
2015-05-08 09:58:59 -04:00
|
|
|
|
|
2018-10-19 16:46:23 -04:00
|
|
|
|
(service ntp-service-type)
|
2015-05-08 09:58:59 -04:00
|
|
|
|
|
2023-03-06 07:35:01 -05:00
|
|
|
|
(service x11-socket-directory-service-type)
|
2018-03-31 08:34:50 -04:00
|
|
|
|
|
2020-01-09 20:48:24 -05:00
|
|
|
|
(service pulseaudio-service-type)
|
2018-05-02 08:01:37 -04:00
|
|
|
|
(service alsa-service-type)
|
|
|
|
|
|
services: Introduce extensible services.
This patch rewrites GuixSD services to make them extensible.
* gnu-system.am (GNU_SYSTEM_MODULES): Add gnu/services/dbus.scm.
* gnu/services.scm (<service>): Replace with new record type.
(<service-extension>, <service-type>): New record types.
(write-service-type, compute-boot-script, second-argument): New
procedures.
(%boot-service, boot-service-type): New variables.
(file-union, directory-union, modprobe-wrapper,
activation-service->script, activation-script,
gexps->activation-gexp): New procedures.
(activation-service-type, %activation-service): New variables.
(etc-directory, files->etc-directory, etc-service): New procedures.
(etc-service-type, setuid-program-service, firmware-service-type): New
variables.
(firmware->activation-gexp): New procedure.
(&service-error, &missing-target-service-error,
&ambiguous-target-service-error): New condition types.
(service-back-edges, fold-services): New procedures.
* gnu/services/avahi.scm (<avahi-configuration>): New record type.
(configuration-file): Replace keyword parameters with a single
'config' parameter.
(%avahi-accounts, %avahi-activation, avahi-service-type): New
variables.
(avahi-dmd-service): New procedure.
(avahi-service): Rewrite using 'service' and 'avahi-configuration'.
* gnu/services/base.scm (%root-file-system-dmd-service,
root-file-system-service-type): New variables.
(root-file-system-service): Use them.
(file-system->dmd-service-name): New procedure.
(file-system-service-type): New variable.
(file-system-service): Use it. Replace keyword parameters with a
single 'file-system' object.
(user-unmount-service-type): New variable.
(user-unmount-service): Use it.
(user-processes-service-type): New variable.
(user-processes-service): Use it.
(host-name-service-type): New variable.
(host-name-service): Use it.
(console-keymap-service-type): New variable.
(console-keymap-service): Use it.
(console-font-service-type): New variable.
(console-font-service): Use it.
(mingetty-pam-service, mingetty-dmd-service): New procedures.
(mingetty-service-type): New variable.
(mingetty-service): Use it.
(nscd-dmd-service): New procedure.
(nscd-activation, nscd-service-type): New variables.
(nscd-service): Use the latter.
(syslog-service-type): New variable.
(syslog-service): Use it.
(<guix-configuration>): New record type.
(%default-guix-configuration): New variable.
(guix-dmd-service, guix-accounts, guix-activation): New procedures.
(guix-service-type): New variable.
(guix-service): Replace list of keyword parameters with a single
'config' parameter. Rewrite using 'service'.
(<udev-configuration>): New record type.
(udev-dmd-service): New procedure.
(udev-service-type): New variable.
(udev-service): Use it.
(device-mapping-service-type): New variable.
(device-mapping-service): Use it.
(swap-service-type): New variable.
(swap-service): Use it.
* gnu/services/databases.scm (<postgresql-configuration>): New record
type.
(%postgresql-accounts, postgresql-activation): New variables.
(postgresql-dmd-service): New procedure.
(postgresql-service): Rewrite using 'service' and
'postgresql-configuration'.
* gnu/services/dbus.scm: New file.
* gnu/services/desktop.scm (dbus-configuration-directory, dbus-service):
Remove.
(wrapped-dbus-service): New procedure.
(<upower-configuration>): New record type.
(upower-configuration-file): Replace keyword parameters with single
<upower-configuration> parameter.
(%upower-accounts, %upower-activation): New variables.
(upower-dbus-service, upower-dmd-service): New procedures.
(upower-service-type): New variable.
(upower-service): Rewrite using 'service' and 'upower-configuration'.
(%colord-activation, %colord-accounts): New variables.
(colord-dmd-service): New procedure.
(colord-service-type): New variable.
(colord-service): Rewrite using 'service'.
(<geoclue-configuration>): New record type.
(geoclue-configuration-file): Replace keyword parameters with a single
'config' parameter.
(geoclue-dbus-service, geoclue-dmd-service): New procedures.
(%geoclue-accounts, geoclue-service-type): New variables.
(geoclue-service): Rewrite using 'service' and
'geoclue-configuration'.
(%polkit-accounts, %polkit-pam-services, polkit-service-type): New
variables.
(polkit-dmd-service): New procedure.
(polkit-service): Rewrite using 'service'.
(<elogind-configuration>)[elogind]: New field.
(elogind-dmd-service): New procedure.
(elogind-service-type): New variable.
(elogind-service): Rewrite using 'service'.
(%desktop-services): Remove argument to 'dbus-service'. Remove 'map'
over %BASE-SERVICES.
* gnu/services/dmd.scm (dmd-boot-gexp): New procedure.
(dmd-root-service-type, %dmd-root-service): New variables.
(dmd-service-type): New macro.
(<dmd-service>): New record type.
* gnu/services/lirc.scm (<lirc-configuration>): New record type.
(%lirc-activation): New variable.
(lirc-dmd-service): New procedure.
(lirc-service-type): New variable.
(lirc-service): Rewrite using 'service' and 'lirc-configuration'.
* gnu/services/networking.scm (<static-networking>): New record type.
(static-networking-service-type): New variable.
(static-networking-service): Rewrite using 'service' and
'static-networking'.
(dhcp-client-service-type): New variable.
(dhcp-client-service): Rewrite using 'service'.
(<ntp-configuration>): New record type.
(ntp-dmd-service): New procedure.
(ntp-service-type): New variable.
(ntp-service): New procedure.
(%tor-accounts, tor-service-type): New variable.
(tor-dmd-service): New procedure.
(tor-service): Rewrite using 'service'.
(<bitlbee-configuration>): New record type.
(bitlbee-dmd-service): New procedure.
(%bitlbee-accounts, %bitlbee-activation, bitlbee-service-type): New
variables.
(bitlbee-service): Rewrite using 'service'.
(%wicd-activation): New variable.
(wicd-dmd-service): New procedure.
(wicd-service-type): New variable.
(wicd-service): Rewrite using 'service'.
* gnu/services/ssh.scm (<lsh-configuration>): New record type.
(activation): Rename to...
(lsh-initialization): ... this.
(lsh-activation, lsh-dmd-service, lsh-pam-services): New procedures.
(lsh-service-type): New variable.
(lsh-service): Rewrite using 'service' and 'lsh-configuration'.
* gnu/services/web.scm (<nginx-configuration>): New record type.
(%nginx-accounts): New variable.
(nginx-activation, nginx-dmd-service): New procedures.
(nginx-service-type): New variable.
(nginx-service): Rewrite using 'service' and 'nginx-configuration'.
* gnu/services/xorg.scm (<slim-configuration>): New record type.
(slim-pam-service, slim-dmd-service): New procedures.
(slim-service-type): New variable.
(slim-service): Rewrite using 'service' and 'slim-configuration'.
* gnu/system.scm (file-union): Remove.
(other-file-system-services): Adjust to new 'file-system-service'
signature.
(essential-services): Add #:container? parameter. Add
%DMD-ROOT-SERVICE, %ACTIVATION-SERVICE, and calls to
'pam-root-service', 'account-service', 'operating-system-etc-service',
and a SETUID-PROGRAM-SERVICE instance.
(operating-system-services): Pass #:container? to 'essential-services.
(etc-directory): Remove.
(operating-system-etc-service): New procedure. Rewrite as a call to
'etc-service'.
(operating-system-accounts): Change to not return accounts required by
services.
(operating-system-etc-directory): Rewrite as a call to 'fold-services'
and 'etc-directory'.
(user-group->gexp, user-account->gexp, modprobe-wrapper): Remove.
(operating-system-activation-script): Rewrite as a call to
'fold-services' and 'activation-service->script'.
(operating-system-boot-script): Likewise.
(operating-system-derivation): Add call to 'lower-object'.
(emacs-site-file, emacs-site-directory, shells-file): Change to use
'computed-file' and 'scheme-file' instead of the monadic procedures.
* gnu/system/install.scm (cow-store-service-type): New variable.
(cow-store-service): Rewrite using 'service'.
(/etc/configuration-files): New procedure.
(configuration-template-service-type,
%configuration-template-service): New variables.
(configuration-template-service): Remove.
(installation-services): Adjust accordingly. Adjust argument to
'guix-service'.
* gnu/system/linux.scm (/etc-entry, pam-root-service): New procedures.
(pam-root-service-type): New variable.
* gnu/system/shadow.scm (user-group->gexp, user-account->gexp,
account-activation, etc-skel, account-service): New procedures.
(account-service-type): New variable.
* tests/services.scm: New file.
* doc/guix.texi (Base Services, Desktop Services): Adjust accordingly.
(Defining Services): Rewrite.
* doc/images/service-graph.dot: New file.
* doc.am (DOT_FILES): Add it.
* po/guix/POTFILES.in: Add gnu/services.scm.
2015-09-17 17:44:26 -04:00
|
|
|
|
%base-services))
|
2015-05-08 09:58:59 -04:00
|
|
|
|
|
2021-12-08 09:41:00 -05:00
|
|
|
|
(define-syntax %desktop-services
|
|
|
|
|
(identifier-syntax (desktop-services-for-system)))
|
|
|
|
|
|
2015-05-01 13:36:10 -04:00
|
|
|
|
;;; desktop.scm ends here
|