0adfe95a3e
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.
142 lines
3.8 KiB
Plaintext
142 lines
3.8 KiB
Plaintext
# GNU Guix --- Functional package management for GNU
|
||
# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||
#
|
||
# 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/>.
|
||
|
||
info_TEXINFOS = doc/guix.texi
|
||
|
||
DOT_FILES = \
|
||
doc/images/bootstrap-graph.dot \
|
||
doc/images/coreutils-graph.dot \
|
||
doc/images/coreutils-bag-graph.dot \
|
||
doc/images/service-graph.dot
|
||
|
||
DOT_VECTOR_GRAPHICS = \
|
||
$(DOT_FILES:%.dot=%.eps) \
|
||
$(DOT_FILES:%.dot=%.pdf)
|
||
|
||
EXTRA_DIST += \
|
||
doc/contributing.texi \
|
||
doc/emacs.texi \
|
||
doc/fdl-1.3.texi \
|
||
$(DOT_FILES) \
|
||
$(DOT_VECTOR_GRAPHICS) \
|
||
doc/images/coreutils-size-map.eps \
|
||
doc/environment-gdb.scm \
|
||
doc/package-hello.scm
|
||
|
||
OS_CONFIG_EXAMPLES_TEXI = \
|
||
doc/os-config-bare-bones.texi \
|
||
doc/os-config-desktop.texi
|
||
|
||
# Bundle this file so that makeinfo finds it in out-of-source-tree builds.
|
||
BUILT_SOURCES += $(OS_CONFIG_EXAMPLES_TEXI)
|
||
EXTRA_DIST += $(OS_CONFIG_EXAMPLES_TEXI)
|
||
MAINTAINERCLEANFILES = $(OS_CONFIG_EXAMPLES_TEXI)
|
||
|
||
doc/os-config-%.texi: gnu/system/examples/%.tmpl
|
||
$(MKDIR_P) "`dirname "$@"`"
|
||
cp "$<" "$@"
|
||
|
||
infoimagedir = $(infodir)/images
|
||
dist_infoimage_DATA = \
|
||
$(DOT_FILES:%.dot=%.png) \
|
||
doc/images/coreutils-size-map.png
|
||
|
||
# Try hard to obtain an image size and aspect that's reasonable for inclusion
|
||
# in an Info or PDF document.
|
||
DOT_OPTIONS = \
|
||
-Gratio=.9 -Gnodesep=.005 -Granksep=.00005 \
|
||
-Nfontsize=9 -Nheight=.1 -Nwidth=.1
|
||
|
||
.dot.png:
|
||
$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$@.tmp"
|
||
mv "$@.tmp" "$@"
|
||
|
||
.dot.pdf:
|
||
$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$@.tmp"
|
||
mv "$@.tmp" "$@"
|
||
|
||
.dot.eps:
|
||
$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$@.tmp"
|
||
mv "$@.tmp" "$@"
|
||
|
||
.png.eps:
|
||
convert "$<" "$@-tmp.eps"
|
||
mv "$@-tmp.eps" "$@"
|
||
|
||
# We cannot add new dependencies to `doc/guix.pdf' & co. (info "(automake)
|
||
# Extending"). Using the `-local' rules is imperfect, because they may be
|
||
# triggered after the main rule. Oh, well.
|
||
pdf-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.pdf)
|
||
info-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.png)
|
||
ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps) \
|
||
$(top_srcdir)/doc/images/coreutils-size-map.eps
|
||
dvi-local: ps-local
|
||
|
||
|
||
# Manual pages.
|
||
|
||
doc/guix.1: $(SUBCOMMANDS:%=guix/scripts/%.scm)
|
||
-LANGUAGE= $(top_builddir)/pre-inst-env \
|
||
$(HELP2MAN) --output="$@" guix
|
||
|
||
# Note: Do not depend on 'guix-daemon' since that would trigger a rebuild even
|
||
# for people building from a tarball.
|
||
doc/guix-daemon.1: nix/nix-daemon/guix-daemon.cc
|
||
-LANGUAGE= $(top_builddir)/pre-inst-env \
|
||
$(HELP2MAN) --output="$@" guix-daemon
|
||
|
||
define subcommand-manual-target
|
||
|
||
doc/guix-$(1).1: guix/scripts/$(1).scm
|
||
-LANGUAGE= $(top_builddir)/pre-inst-env \
|
||
$(HELP2MAN) --output="$$@" "guix $(1)"
|
||
|
||
endef
|
||
|
||
SUBCOMMANDS := \
|
||
archive \
|
||
build \
|
||
download \
|
||
edit \
|
||
environment \
|
||
gc \
|
||
hash \
|
||
import \
|
||
lint \
|
||
package \
|
||
publish \
|
||
pull \
|
||
refresh \
|
||
size \
|
||
system
|
||
|
||
$(eval $(foreach subcommand,$(SUBCOMMANDS), \
|
||
$(call subcommand-manual-target,$(subcommand))))
|
||
|
||
dist_man1_MANS = \
|
||
doc/guix.1 \
|
||
$(SUBCOMMANDS:%=doc/guix-%.1)
|
||
|
||
if BUILD_DAEMON
|
||
|
||
dist_man1_MANS += \
|
||
doc/guix-daemon.1
|
||
|
||
endif
|