2013-08-28 21:44:14 +02:00
|
|
|
|
# GNU Guix --- Functional package management for GNU
|
2016-01-28 03:31:04 +01:00
|
|
|
|
# Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
|
2016-01-10 10:14:43 +01:00
|
|
|
|
# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
|
2013-08-28 21:44:14 +02:00
|
|
|
|
# Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
2016-01-10 10:14:43 +01:00
|
|
|
|
# Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
|
2016-01-28 03:31:04 +01:00
|
|
|
|
# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
|
2013-08-28 21:44:14 +02: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/>.
|
|
|
|
|
|
|
2013-08-29 21:20:51 +02:00
|
|
|
|
info_TEXINFOS = doc/guix.texi
|
2015-08-27 00:36:41 +02:00
|
|
|
|
|
|
|
|
|
|
DOT_FILES = \
|
|
|
|
|
|
doc/images/bootstrap-graph.dot \
|
2016-01-12 15:52:56 +01:00
|
|
|
|
doc/images/bootstrap-packages.dot \
|
2015-08-27 00:36:41 +02:00
|
|
|
|
doc/images/coreutils-graph.dot \
|
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 23:44:26 +02:00
|
|
|
|
doc/images/coreutils-bag-graph.dot \
|
2015-10-14 19:17:12 +02:00
|
|
|
|
doc/images/service-graph.dot \
|
2016-01-27 21:06:07 +01:00
|
|
|
|
doc/images/shepherd-graph.dot
|
2015-08-27 00:36:41 +02:00
|
|
|
|
|
|
|
|
|
|
DOT_VECTOR_GRAPHICS = \
|
|
|
|
|
|
$(DOT_FILES:%.dot=%.eps) \
|
|
|
|
|
|
$(DOT_FILES:%.dot=%.pdf)
|
|
|
|
|
|
|
2013-08-29 21:20:51 +02:00
|
|
|
|
EXTRA_DIST += \
|
2015-06-10 13:39:54 +02:00
|
|
|
|
doc/contributing.texi \
|
2014-11-17 18:02:05 +01:00
|
|
|
|
doc/emacs.texi \
|
2013-08-29 21:20:51 +02:00
|
|
|
|
doc/fdl-1.3.texi \
|
2015-08-27 00:36:41 +02:00
|
|
|
|
$(DOT_FILES) \
|
|
|
|
|
|
$(DOT_VECTOR_GRAPHICS) \
|
2015-07-19 21:55:21 +02:00
|
|
|
|
doc/images/coreutils-size-map.eps \
|
2015-08-09 17:35:51 +02:00
|
|
|
|
doc/environment-gdb.scm \
|
|
|
|
|
|
doc/package-hello.scm
|
2013-08-28 21:44:14 +02:00
|
|
|
|
|
2015-05-09 23:51:46 +02:00
|
|
|
|
OS_CONFIG_EXAMPLES_TEXI = \
|
|
|
|
|
|
doc/os-config-bare-bones.texi \
|
|
|
|
|
|
doc/os-config-desktop.texi
|
|
|
|
|
|
|
2014-07-24 23:38:39 +02:00
|
|
|
|
# Bundle this file so that makeinfo finds it in out-of-source-tree builds.
|
2015-05-09 23:51:46 +02:00
|
|
|
|
BUILT_SOURCES += $(OS_CONFIG_EXAMPLES_TEXI)
|
|
|
|
|
|
EXTRA_DIST += $(OS_CONFIG_EXAMPLES_TEXI)
|
|
|
|
|
|
MAINTAINERCLEANFILES = $(OS_CONFIG_EXAMPLES_TEXI)
|
2014-07-24 23:38:39 +02:00
|
|
|
|
|
2015-05-09 23:51:46 +02:00
|
|
|
|
doc/os-config-%.texi: gnu/system/examples/%.tmpl
|
2016-01-24 19:04:53 +01:00
|
|
|
|
$(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \
|
2014-07-24 23:38:39 +02:00
|
|
|
|
cp "$<" "$@"
|
|
|
|
|
|
|
2013-08-28 21:44:14 +02:00
|
|
|
|
infoimagedir = $(infodir)/images
|
2015-06-21 23:25:19 +02:00
|
|
|
|
dist_infoimage_DATA = \
|
2015-08-27 00:36:41 +02:00
|
|
|
|
$(DOT_FILES:%.dot=%.png) \
|
2015-06-21 23:25:19 +02:00
|
|
|
|
doc/images/coreutils-size-map.png
|
2013-08-28 21:44:14 +02:00
|
|
|
|
|
|
|
|
|
|
# Try hard to obtain an image size and aspect that's reasonable for inclusion
|
|
|
|
|
|
# in an Info or PDF document.
|
2013-08-29 21:57:09 +02:00
|
|
|
|
DOT_OPTIONS = \
|
|
|
|
|
|
-Gratio=.9 -Gnodesep=.005 -Granksep=.00005 \
|
2013-08-28 21:44:14 +02:00
|
|
|
|
-Nfontsize=9 -Nheight=.1 -Nwidth=.1
|
|
|
|
|
|
|
|
|
|
|
|
.dot.png:
|
2016-01-24 18:55:38 +01:00
|
|
|
|
$(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
|
2016-01-10 10:14:43 +01:00
|
|
|
|
mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
|
2013-08-28 21:44:14 +02:00
|
|
|
|
|
2013-08-29 21:57:09 +02:00
|
|
|
|
.dot.pdf:
|
2016-01-24 18:55:38 +01:00
|
|
|
|
$(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
|
2016-01-10 10:14:43 +01:00
|
|
|
|
mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
|
2013-08-29 21:57:09 +02:00
|
|
|
|
|
2013-08-28 21:44:14 +02:00
|
|
|
|
.dot.eps:
|
2016-01-24 18:55:38 +01:00
|
|
|
|
$(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
|
2016-01-10 10:14:43 +01:00
|
|
|
|
mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
|
2013-08-28 21:44:14 +02:00
|
|
|
|
|
2015-07-19 21:55:21 +02:00
|
|
|
|
.png.eps:
|
2016-01-24 19:04:53 +01:00
|
|
|
|
$(AM_V_GEN)convert "$<" "$@-tmp.eps"; \
|
2015-07-19 21:55:21 +02:00
|
|
|
|
mv "$@-tmp.eps" "$@"
|
|
|
|
|
|
|
2013-08-29 21:20:51 +02:00
|
|
|
|
# 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.
|
2015-08-27 00:36:41 +02:00
|
|
|
|
pdf-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.pdf)
|
|
|
|
|
|
info-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.png)
|
|
|
|
|
|
ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps) \
|
2015-07-19 21:55:21 +02:00
|
|
|
|
$(top_srcdir)/doc/images/coreutils-size-map.eps
|
|
|
|
|
|
dvi-local: ps-local
|
2015-06-01 22:37:54 +02:00
|
|
|
|
|
2016-01-28 03:31:04 +01:00
|
|
|
|
## ----------- ##
|
|
|
|
|
|
## Man pages. ##
|
|
|
|
|
|
## ----------- ##
|
|
|
|
|
|
|
|
|
|
|
|
sub_commands_mans = \
|
|
|
|
|
|
doc/guix-archive.1 \
|
|
|
|
|
|
doc/guix-build.1 \
|
|
|
|
|
|
doc/guix-challenge.1 \
|
|
|
|
|
|
doc/guix-download.1 \
|
|
|
|
|
|
doc/guix-edit.1 \
|
|
|
|
|
|
doc/guix-environment.1 \
|
|
|
|
|
|
doc/guix-gc.1 \
|
|
|
|
|
|
doc/guix-hash.1 \
|
|
|
|
|
|
doc/guix-import.1 \
|
|
|
|
|
|
doc/guix-lint.1 \
|
|
|
|
|
|
doc/guix-package.1 \
|
|
|
|
|
|
doc/guix-publish.1 \
|
|
|
|
|
|
doc/guix-pull.1 \
|
|
|
|
|
|
doc/guix-refresh.1 \
|
|
|
|
|
|
doc/guix-size.1 \
|
|
|
|
|
|
doc/guix-system.1
|
2015-06-01 22:37:54 +02:00
|
|
|
|
|
|
|
|
|
|
dist_man1_MANS = \
|
|
|
|
|
|
doc/guix.1 \
|
2016-01-28 03:31:04 +01:00
|
|
|
|
$(sub_commands_mans)
|
|
|
|
|
|
|
|
|
|
|
|
# Man pages are generated using GNU help2man.
|
|
|
|
|
|
gen_man = LANGUAGE= $(top_builddir)/pre-inst-env $(HELP2MAN)
|
|
|
|
|
|
|
|
|
|
|
|
# Note: Do not depend on 'scripts/guix' since that would trigger a rebuild
|
|
|
|
|
|
# even for people building from a tarball.
|
|
|
|
|
|
doc/guix.1: $(sub_commands_mans)
|
|
|
|
|
|
-$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1`
|
|
|
|
|
|
|
|
|
|
|
|
# Note: The dependency on $(GOBJECTS) is meant to force these docs to be made
|
|
|
|
|
|
# only after all Guile modules have been compiled. The 'case' ensures the man
|
|
|
|
|
|
# pages are only generated if the corresponding script source has been
|
|
|
|
|
|
# changed.
|
|
|
|
|
|
doc/guix-%.1: guix/scripts/%.scm $(GOBJECTS)
|
|
|
|
|
|
-@case '$?' in \
|
|
|
|
|
|
*$<*) $(AM_V_P) && set -x || echo " HELP2MAN $@"; \
|
|
|
|
|
|
$(gen_man) --output="$@" "guix $*";; \
|
|
|
|
|
|
*) : ;; \
|
|
|
|
|
|
esac
|
2015-06-16 10:04:35 +02:00
|
|
|
|
|
|
|
|
|
|
if BUILD_DAEMON
|
|
|
|
|
|
|
2016-01-28 03:31:04 +01:00
|
|
|
|
dist_man1_MANS += doc/guix-daemon.1
|
|
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
|
-$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1`
|
2015-06-16 10:04:35 +02:00
|
|
|
|
|
|
|
|
|
|
endif
|