* [PATCH 1/2] build: Move included files to subdirectories.
2016-04-03 16:18 [PATCH 0/2] Clean repository top-level directory Mathieu Lirzin
@ 2016-04-03 16:18 ` Mathieu Lirzin
2016-04-04 2:36 ` Eric Bavier
2016-04-03 16:18 ` [PATCH 2/2] build: Move environment scripts to 'build-aux' directory Mathieu Lirzin
1 sibling, 1 reply; 15+ messages in thread
From: Mathieu Lirzin @ 2016-04-03 16:18 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 1453 bytes --]
This follows a convention used by some other GNU packages like Autoconf,
Bison, Coreutils, and Gnulib.
* doc.am: Rename to ...
* doc/local.mk: ... this.
* emacs.am: Rename to ...
* emacs/local.mk: ... this.
* gnu-system.am: Rename to ...
* gnu/local.mk: ... this.
* daemon.am: Rename to ...
* nix/local.mk: ... this.
* Makefile.am: Adapt to them.
* doc/guix.texi (Porting to a New Platform): Adapt documentation.
* guix/config.scm.in (%state-directory, %config-directory): Adapt comments.
* emacs/guix-config.el.in (guix-config-state-directory): Likewise.
---
Makefile.am | 8 +-
daemon.am | 226 -------------
doc.am | 157 ---------
doc/guix.texi | 2 +-
doc/local.mk | 157 +++++++++
emacs.am | 73 ----
emacs/guix-config.el.in | 2 +-
emacs/local.mk | 73 ++++
gnu-system.am | 883 ------------------------------------------------
gnu/local.mk | 883 ++++++++++++++++++++++++++++++++++++++++++++++++
guix/config.scm.in | 4 +-
nix/local.mk | 226 +++++++++++++
12 files changed, 1347 insertions(+), 1347 deletions(-)
delete mode 100644 daemon.am
delete mode 100644 doc.am
create mode 100644 doc/local.mk
delete mode 100644 emacs.am
create mode 100644 emacs/local.mk
delete mode 100644 gnu-system.am
create mode 100644 gnu/local.mk
create mode 100644 nix/local.mk
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-build-Move-included-files-to-subdirectories.patch --]
[-- Type: text/x-patch; name="0001-build-Move-included-files-to-subdirectories.patch", Size: 112871 bytes --]
diff --git a/Makefile.am b/Makefile.am
index 4c00db1..50b549d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ nodist_noinst_SCRIPTS = \
pre-inst-env \
test-env
-include gnu-system.am
+include gnu/local.mk
MODULES = \
guix/base32.scm \
@@ -415,11 +415,11 @@ install-data-hook: set-bootstrap-executable-permissions
SUBDIRS = po/guix po/packages
BUILT_SOURCES =
-include doc.am
+include doc/local.mk
if BUILD_DAEMON
-include daemon.am
+include nix/local.mk
endif BUILD_DAEMON
@@ -436,7 +436,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
dist_emacsui_DATA = emacs/guix-main.scm
nodist_emacsui_DATA = emacs/guix-helper.scm
-include emacs.am
+include emacs/local.mk
# The self-contained tarball.
guix-binary.%.tar.xz:
diff --git a/daemon.am b/daemon.am
deleted file mode 100644
index 3c15531..0000000
--- a/daemon.am
+++ /dev/null
@@ -1,226 +0,0 @@
-# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
-# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
-#
-# 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/>.
-
-#
-# Integration of the `guix-daemon' code taken from upstream Nix.
-#
-
-BUILT_SOURCES += nix/libstore/schema.sql.hh
-CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service etc/guix-daemon.conf
-
-noinst_LIBRARIES = libformat.a libutil.a libstore.a
-
-# Use '-std=c++11' for 'std::shared_ptr', 'auto', lambdas, and more.
-AM_CXXFLAGS = -Wall -std=c++11
-
-libformat_a_SOURCES = \
- nix/boost/format/free_funcs.cc \
- nix/boost/format/parsing.cc \
- nix/boost/format/format_implementation.cc
-
-libformat_headers = \
- nix/boost/throw_exception.hpp \
- nix/boost/format.hpp \
- nix/boost/assert.hpp \
- nix/boost/format/macros_default.hpp \
- nix/boost/format/format_fwd.hpp \
- nix/boost/format/format_class.hpp \
- nix/boost/format/exceptions.hpp \
- nix/boost/format/group.hpp \
- nix/boost/format/feed_args.hpp \
- nix/boost/format/internals_fwd.hpp \
- nix/boost/format/internals.hpp
-
-libformat_a_CPPFLAGS = \
- -I$(top_srcdir)/nix
-
-libutil_a_SOURCES = \
- nix/libutil/archive.cc \
- nix/libutil/affinity.cc \
- nix/libutil/serialise.cc \
- nix/libutil/util.cc \
- nix/libutil/xml-writer.cc \
- nix/libutil/hash.cc \
- nix/libutil/gcrypt-hash.cc
-
-libutil_headers = \
- nix/libutil/affinity.hh \
- nix/libutil/hash.hh \
- nix/libutil/serialise.hh \
- nix/libutil/xml-writer.hh \
- nix/libutil/util.hh \
- nix/libutil/archive.hh \
- nix/libutil/types.hh \
- nix/libutil/gcrypt-hash.hh \
- nix/libutil/md5.h \
- nix/libutil/sha1.h \
- nix/libutil/sha256.h \
- nix/libutil/sha512.h
-
-libutil_a_CPPFLAGS = \
- -I$(top_builddir)/nix \
- -I$(top_srcdir)/nix/libutil \
- $(libformat_a_CPPFLAGS)
-
-libstore_a_SOURCES = \
- nix/libstore/gc.cc \
- nix/libstore/globals.cc \
- nix/libstore/misc.cc \
- nix/libstore/references.cc \
- nix/libstore/store-api.cc \
- nix/libstore/optimise-store.cc \
- nix/libstore/local-store.cc \
- nix/libstore/build.cc \
- nix/libstore/pathlocks.cc \
- nix/libstore/derivations.cc
-
-libstore_headers = \
- nix/libstore/references.hh \
- nix/libstore/pathlocks.hh \
- nix/libstore/globals.hh \
- nix/libstore/worker-protocol.hh \
- nix/libstore/derivations.hh \
- nix/libstore/misc.hh \
- nix/libstore/local-store.hh \
- nix/libstore/store-api.hh
-
-libstore_a_CPPFLAGS = \
- $(libutil_a_CPPFLAGS) \
- -I$(top_srcdir)/nix/libstore \
- -I$(top_builddir)/nix/libstore \
- -DNIX_STORE_DIR=\"$(storedir)\" \
- -DNIX_DATA_DIR=\"$(datadir)\" \
- -DNIX_STATE_DIR=\"$(localstatedir)/guix\" \
- -DNIX_LOG_DIR=\"$(localstatedir)/log/guix\" \
- -DNIX_CONF_DIR=\"$(sysconfdir)/guix\" \
- -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \
- -DNIX_BIN_DIR=\"$(bindir)\" \
- -DOPENSSL_PATH="\"guix-authenticate\"" \
- -DDEFAULT_CHROOT_DIRS="\"\""
-
-libstore_a_CXXFLAGS = $(AM_CXXFLAGS) \
- $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS)
-
-bin_PROGRAMS = guix-daemon
-sbin_PROGRAMS = guix-register
-
-guix_daemon_SOURCES = \
- nix/nix-daemon/nix-daemon.cc \
- nix/nix-daemon/guix-daemon.cc
-
-guix_daemon_CPPFLAGS = \
- -DLOCALEDIR=\"$(localedir)\" \
- $(libutil_a_CPPFLAGS) \
- -I$(top_srcdir)/nix/libstore
-
-guix_daemon_LDADD = \
- libstore.a libutil.a libformat.a -lbz2 \
- $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS)
-
-guix_daemon_headers = \
- nix/nix-daemon/shared.hh
-
-
-guix_register_SOURCES = \
- nix/guix-register/guix-register.cc
-
-guix_register_CPPFLAGS = \
- $(libutil_a_CPPFLAGS) \
- $(libstore_a_CPPFLAGS) \
- -I$(top_srcdir)/nix/libstore
-
-# XXX: Should we start using shared libs?
-guix_register_LDADD = \
- libstore.a libutil.a libformat.a -lbz2 \
- $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS)
-
-
-noinst_HEADERS = \
- $(libformat_headers) $(libutil_headers) $(libstore_headers) \
- $(guix_daemon_headers)
-
-nix/libstore/schema.sql.hh: nix/libstore/schema.sql
- $(AM_V_GEN)$(GUILE) --no-auto-compile -c \
- "(use-modules (rnrs io ports)) \
- (call-with-output-file \"$@\" \
- (lambda (out) \
- (call-with-input-file \"$^\" \
- (lambda (in) \
- (write (get-string-all in) out)))))"
-
-nodist_pkglibexec_SCRIPTS = \
- nix/scripts/list-runtime-roots \
- nix/scripts/substitute
-
-if BUILD_DAEMON_OFFLOAD
-
-nodist_pkglibexec_SCRIPTS += \
- nix/scripts/offload
-
-endif BUILD_DAEMON_OFFLOAD
-
-
-# XXX: It'd be better to hide it in $(pkglibexecdir).
-nodist_libexec_SCRIPTS = \
- nix/scripts/guix-authenticate
-
-# The '.service' file for systemd.
-systemdservicedir = $(libdir)/systemd/system
-nodist_systemdservice_DATA = etc/guix-daemon.service
-
-etc/guix-daemon.service: etc/guix-daemon.service.in \
- $(top_builddir)/config.status
- $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \
- $(SED) -e 's|@''bindir''@|$(bindir)|' < \
- "$(srcdir)/etc/guix-daemon.service.in" > "$@.tmp"; \
- mv "$@.tmp" "$@"
-
-# The '.conf' job for Upstart.
-upstartjobdir = $(libdir)/upstart/system
-nodist_upstartjob_DATA = etc/guix-daemon.conf
-
-etc/guix-daemon.conf: etc/guix-daemon.conf.in \
- $(top_builddir)/config.status
- $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \
- $(SED) -e 's|@''bindir''@|$(bindir)|' < \
- "$(srcdir)/etc/guix-daemon.conf.in" > "$@.tmp"; \
- mv "$@.tmp" "$@"
-
-EXTRA_DIST += \
- nix/libstore/schema.sql \
- nix/AUTHORS \
- nix/COPYING \
- etc/guix-daemon.service.in \
- etc/guix-daemon.conf.in
-
-if CAN_RUN_TESTS
-
-AM_TESTS_ENVIRONMENT += \
- top_builddir="$(abs_top_builddir)"
-
-TESTS += \
- tests/guix-daemon.sh
-
-endif CAN_RUN_TESTS
-
-clean-local:
- -if test -d "$(GUIX_TEST_ROOT)"; then \
- find "$(GUIX_TEST_ROOT)" | xargs chmod +w; \
- fi
- -rm -rf "$(GUIX_TEST_ROOT)"
diff --git a/doc.am b/doc.am
deleted file mode 100644
index b9f07c3..0000000
--- a/doc.am
+++ /dev/null
@@ -1,157 +0,0 @@
-# GNU Guix --- Functional package management for GNU
-# Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
-# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
-# Copyright © 2013 Andreas Enge <andreas@enge.fr>
-# Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
-# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
-#
-# 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/bootstrap-packages.dot \
- doc/images/coreutils-graph.dot \
- doc/images/coreutils-bag-graph.dot \
- doc/images/service-graph.dot \
- doc/images/shepherd-graph.dot
-
-DOT_VECTOR_GRAPHICS = \
- $(DOT_FILES:%.dot=%.eps) \
- $(DOT_FILES:%.dot=%.pdf)
-
-EXTRA_DIST += \
- doc/htmlxref.cnf \
- 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 \
- doc/os-config-lightweight-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
- $(AM_V_GEN)$(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:
- $(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
- mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
-
-.dot.pdf:
- $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
- mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
-
-.dot.eps:
- $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
- mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
-
-.png.eps:
- $(AM_V_GEN)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
-
-## ----------- ##
-## Man pages. ##
-## ----------- ##
-
-# The man pages are generated using GNU Help2man. In makefiles rules they
-# depend not on the binary, but on the source files. This usage allows a
-# manual page to be generated by the maintainer and included in the
-# distribution without requiring the end-user to have 'help2man' installed.
-# They are built in $(srcdir) like info manuals.
-
-sub_commands_mans = \
- $(srcdir)/doc/guix-archive.1 \
- $(srcdir)/doc/guix-build.1 \
- $(srcdir)/doc/guix-challenge.1 \
- $(srcdir)/doc/guix-download.1 \
- $(srcdir)/doc/guix-edit.1 \
- $(srcdir)/doc/guix-environment.1 \
- $(srcdir)/doc/guix-gc.1 \
- $(srcdir)/doc/guix-hash.1 \
- $(srcdir)/doc/guix-import.1 \
- $(srcdir)/doc/guix-lint.1 \
- $(srcdir)/doc/guix-package.1 \
- $(srcdir)/doc/guix-publish.1 \
- $(srcdir)/doc/guix-pull.1 \
- $(srcdir)/doc/guix-refresh.1 \
- $(srcdir)/doc/guix-size.1 \
- $(srcdir)/doc/guix-system.1
-
-dist_man1_MANS = \
- $(srcdir)/doc/guix.1 \
- $(sub_commands_mans)
-
-gen_man = \
- LANGUAGE= $(top_builddir)/pre-inst-env $(HELP2MAN) \
- $(HELP2MANFLAGS)
-
-HELP2MANFLAGS = --source=GNU --info-page=$(PACKAGE_TARNAME)
-
-$(srcdir)/doc/guix.1: scripts/guix.in $(sub_commands_mans)
- -$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1`
-
-# The 'case' ensures the man pages are only generated if the corresponding
-# source script (the first prerequisite) has been changed. The $(GOBJECTS)
-# prerequisite is solely meant to force these docs to be made only after all
-# Guile modules have been compiled.
-$(srcdir)/doc/guix-%.1: guix/scripts/%.scm $(GOBJECTS)
- -@case '$?' in \
- *$<*) $(AM_V_P) && set -x || echo " HELP2MAN $@"; \
- $(gen_man) --output="$@" "guix $*";; \
- *) : ;; \
- esac
-
-if BUILD_DAEMON
-
-dist_man1_MANS += $(srcdir)/doc/guix-daemon.1
-
-$(srcdir)/doc/guix-daemon.1: nix/nix-daemon/guix-daemon.cc
- -$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1`
-
-endif
diff --git a/doc/guix.texi b/doc/guix.texi
index a34d547..6956f32 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -11204,7 +11204,7 @@ to be updated to refer to these binaries on the target platform. That
is, the hashes and URLs of the bootstrap tarballs for the new platform
must be added alongside those of the currently supported platforms. The
bootstrap Guile tarball is treated specially: it is expected to be
-available locally, and @file{gnu-system.am} has rules do download it for
+available locally, and @file{gnu/local.mk} has rules do download it for
the supported architectures; a rule for the new platform must be added
as well.
diff --git a/doc/local.mk b/doc/local.mk
new file mode 100644
index 0000000..b9f07c3
--- /dev/null
+++ b/doc/local.mk
@@ -0,0 +1,157 @@
+# GNU Guix --- Functional package management for GNU
+# Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
+# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2013 Andreas Enge <andreas@enge.fr>
+# Copyright © 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
+# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
+#
+# 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/bootstrap-packages.dot \
+ doc/images/coreutils-graph.dot \
+ doc/images/coreutils-bag-graph.dot \
+ doc/images/service-graph.dot \
+ doc/images/shepherd-graph.dot
+
+DOT_VECTOR_GRAPHICS = \
+ $(DOT_FILES:%.dot=%.eps) \
+ $(DOT_FILES:%.dot=%.pdf)
+
+EXTRA_DIST += \
+ doc/htmlxref.cnf \
+ 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 \
+ doc/os-config-lightweight-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
+ $(AM_V_GEN)$(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:
+ $(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
+ mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+
+.dot.pdf:
+ $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
+ mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+
+.dot.eps:
+ $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" > "$(srcdir)/$@.tmp"; \
+ mv "$(srcdir)/$@.tmp" "$(srcdir)/$@"
+
+.png.eps:
+ $(AM_V_GEN)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
+
+## ----------- ##
+## Man pages. ##
+## ----------- ##
+
+# The man pages are generated using GNU Help2man. In makefiles rules they
+# depend not on the binary, but on the source files. This usage allows a
+# manual page to be generated by the maintainer and included in the
+# distribution without requiring the end-user to have 'help2man' installed.
+# They are built in $(srcdir) like info manuals.
+
+sub_commands_mans = \
+ $(srcdir)/doc/guix-archive.1 \
+ $(srcdir)/doc/guix-build.1 \
+ $(srcdir)/doc/guix-challenge.1 \
+ $(srcdir)/doc/guix-download.1 \
+ $(srcdir)/doc/guix-edit.1 \
+ $(srcdir)/doc/guix-environment.1 \
+ $(srcdir)/doc/guix-gc.1 \
+ $(srcdir)/doc/guix-hash.1 \
+ $(srcdir)/doc/guix-import.1 \
+ $(srcdir)/doc/guix-lint.1 \
+ $(srcdir)/doc/guix-package.1 \
+ $(srcdir)/doc/guix-publish.1 \
+ $(srcdir)/doc/guix-pull.1 \
+ $(srcdir)/doc/guix-refresh.1 \
+ $(srcdir)/doc/guix-size.1 \
+ $(srcdir)/doc/guix-system.1
+
+dist_man1_MANS = \
+ $(srcdir)/doc/guix.1 \
+ $(sub_commands_mans)
+
+gen_man = \
+ LANGUAGE= $(top_builddir)/pre-inst-env $(HELP2MAN) \
+ $(HELP2MANFLAGS)
+
+HELP2MANFLAGS = --source=GNU --info-page=$(PACKAGE_TARNAME)
+
+$(srcdir)/doc/guix.1: scripts/guix.in $(sub_commands_mans)
+ -$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1`
+
+# The 'case' ensures the man pages are only generated if the corresponding
+# source script (the first prerequisite) has been changed. The $(GOBJECTS)
+# prerequisite is solely meant to force these docs to be made only after all
+# Guile modules have been compiled.
+$(srcdir)/doc/guix-%.1: guix/scripts/%.scm $(GOBJECTS)
+ -@case '$?' in \
+ *$<*) $(AM_V_P) && set -x || echo " HELP2MAN $@"; \
+ $(gen_man) --output="$@" "guix $*";; \
+ *) : ;; \
+ esac
+
+if BUILD_DAEMON
+
+dist_man1_MANS += $(srcdir)/doc/guix-daemon.1
+
+$(srcdir)/doc/guix-daemon.1: nix/nix-daemon/guix-daemon.cc
+ -$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1`
+
+endif
diff --git a/emacs.am b/emacs.am
deleted file mode 100644
index 1897e2e..0000000
--- a/emacs.am
+++ /dev/null
@@ -1,73 +0,0 @@
-# GNU Guix --- Functional package management for GNU
-# Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com>
-# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
-#
-# 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/>.
-
-AUTOLOADS = emacs/guix-autoloads.el
-
-ELFILES = \
- emacs/guix-backend.el \
- emacs/guix-base.el \
- emacs/guix-build-log.el \
- emacs/guix-buffer.el \
- emacs/guix-command.el \
- emacs/guix-devel.el \
- emacs/guix-emacs.el \
- emacs/guix-entry.el \
- emacs/guix-external.el \
- emacs/guix-geiser.el \
- emacs/guix-guile.el \
- emacs/guix-help-vars.el \
- emacs/guix-history.el \
- emacs/guix-hydra.el \
- emacs/guix-hydra-build.el \
- emacs/guix-hydra-jobset.el \
- emacs/guix-info.el \
- emacs/guix-init.el \
- emacs/guix-license.el \
- emacs/guix-list.el \
- emacs/guix-messages.el \
- emacs/guix-pcomplete.el \
- emacs/guix-popup.el \
- emacs/guix-prettify.el \
- emacs/guix-profiles.el \
- emacs/guix-read.el \
- emacs/guix-ui.el \
- emacs/guix-ui-package.el \
- emacs/guix-ui-generation.el \
- emacs/guix-ui-system-generation.el \
- emacs/guix-utils.el
-
-if HAVE_EMACS
-
-dist_lisp_DATA = $(ELFILES)
-
-nodist_lisp_DATA = \
- emacs/guix-config.el \
- $(AUTOLOADS)
-
-$(AUTOLOADS): $(ELFILES)
- $(AM_V_EMACS)$(EMACS) --batch --eval \
- "(let ((backup-inhibited t) \
- (generated-autoload-file \
- (expand-file-name \"$(AUTOLOADS)\" \"$(builddir)\"))) \
- (update-directory-autoloads \
- (expand-file-name \"emacs\" \"$(srcdir)\")))"
-
-CLEANFILES += $(AUTOLOADS)
-
-endif HAVE_EMACS
diff --git a/emacs/guix-config.el.in b/emacs/guix-config.el.in
index bd82159..d03df9c 100644
--- a/emacs/guix-config.el.in
+++ b/emacs/guix-config.el.in
@@ -24,7 +24,7 @@
(replace-regexp-in-string "${prefix}" "@prefix@" "@emacsuidir@"))
(defconst guix-config-state-directory
- ;; This must match `NIX_STATE_DIR' as defined in `daemon.am'.
+ ;; This must match `NIX_STATE_DIR' as defined in `nix/local.mk'.
(or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/guix"))
(defconst guix-config-guile-program "@GUILE@"
diff --git a/emacs/local.mk b/emacs/local.mk
new file mode 100644
index 0000000..1897e2e
--- /dev/null
+++ b/emacs/local.mk
@@ -0,0 +1,73 @@
+# GNU Guix --- Functional package management for GNU
+# Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com>
+# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
+#
+# 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/>.
+
+AUTOLOADS = emacs/guix-autoloads.el
+
+ELFILES = \
+ emacs/guix-backend.el \
+ emacs/guix-base.el \
+ emacs/guix-build-log.el \
+ emacs/guix-buffer.el \
+ emacs/guix-command.el \
+ emacs/guix-devel.el \
+ emacs/guix-emacs.el \
+ emacs/guix-entry.el \
+ emacs/guix-external.el \
+ emacs/guix-geiser.el \
+ emacs/guix-guile.el \
+ emacs/guix-help-vars.el \
+ emacs/guix-history.el \
+ emacs/guix-hydra.el \
+ emacs/guix-hydra-build.el \
+ emacs/guix-hydra-jobset.el \
+ emacs/guix-info.el \
+ emacs/guix-init.el \
+ emacs/guix-license.el \
+ emacs/guix-list.el \
+ emacs/guix-messages.el \
+ emacs/guix-pcomplete.el \
+ emacs/guix-popup.el \
+ emacs/guix-prettify.el \
+ emacs/guix-profiles.el \
+ emacs/guix-read.el \
+ emacs/guix-ui.el \
+ emacs/guix-ui-package.el \
+ emacs/guix-ui-generation.el \
+ emacs/guix-ui-system-generation.el \
+ emacs/guix-utils.el
+
+if HAVE_EMACS
+
+dist_lisp_DATA = $(ELFILES)
+
+nodist_lisp_DATA = \
+ emacs/guix-config.el \
+ $(AUTOLOADS)
+
+$(AUTOLOADS): $(ELFILES)
+ $(AM_V_EMACS)$(EMACS) --batch --eval \
+ "(let ((backup-inhibited t) \
+ (generated-autoload-file \
+ (expand-file-name \"$(AUTOLOADS)\" \"$(builddir)\"))) \
+ (update-directory-autoloads \
+ (expand-file-name \"emacs\" \"$(srcdir)\")))"
+
+CLEANFILES += $(AUTOLOADS)
+
+endif HAVE_EMACS
diff --git a/gnu-system.am b/gnu-system.am
deleted file mode 100644
index d883cdc..0000000
--- a/gnu-system.am
+++ /dev/null
@@ -1,883 +0,0 @@
-# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
-# Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
-# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
-# Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
-#
-# 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/>.
-
-# Definitions for the GNU System: package modules, patches, bootstrap
-# binaries.
-
-GNU_SYSTEM_MODULES = \
- gnu.scm \
- gnu/artwork.scm \
- gnu/packages.scm \
- gnu/packages/abduco.scm \
- gnu/packages/abiword.scm \
- gnu/packages/acct.scm \
- gnu/packages/acl.scm \
- gnu/packages/admin.scm \
- gnu/packages/adns.scm \
- gnu/packages/algebra.scm \
- gnu/packages/aidc.scm \
- gnu/packages/animation.scm \
- gnu/packages/apl.scm \
- gnu/packages/apr.scm \
- gnu/packages/asciidoc.scm \
- gnu/packages/aspell.scm \
- gnu/packages/attr.scm \
- gnu/packages/audacity.scm \
- gnu/packages/audio.scm \
- gnu/packages/augeas.scm \
- gnu/packages/autogen.scm \
- gnu/packages/autotools.scm \
- gnu/packages/avahi.scm \
- gnu/packages/avr.scm \
- gnu/packages/backup.scm \
- gnu/packages/base.scm \
- gnu/packages/bash.scm \
- gnu/packages/bdw-gc.scm \
- gnu/packages/bioinformatics.scm \
- gnu/packages/bittorrent.scm \
- gnu/packages/bison.scm \
- gnu/packages/boost.scm \
- gnu/packages/bootstrap.scm \
- gnu/packages/busybox.scm \
- gnu/packages/calcurse.scm \
- gnu/packages/ccache.scm \
- gnu/packages/cdrom.scm \
- gnu/packages/certs.scm \
- gnu/packages/check.scm \
- gnu/packages/ci.scm \
- gnu/packages/cmake.scm \
- gnu/packages/code.scm \
- gnu/packages/commencement.scm \
- gnu/packages/compression.scm \
- gnu/packages/conkeror.scm \
- gnu/packages/conky.scm \
- gnu/packages/cook.scm \
- gnu/packages/cpio.scm \
- gnu/packages/cppi.scm \
- gnu/packages/cross-base.scm \
- gnu/packages/crypto.scm \
- gnu/packages/cryptsetup.scm \
- gnu/packages/cups.scm \
- gnu/packages/curl.scm \
- gnu/packages/cyrus-sasl.scm \
- gnu/packages/databases.scm \
- gnu/packages/datamash.scm \
- gnu/packages/datastructures.scm \
- gnu/packages/dav.scm \
- gnu/packages/dc.scm \
- gnu/packages/debug.scm \
- gnu/packages/dejagnu.scm \
- gnu/packages/dico.scm \
- gnu/packages/dictionaries.scm \
- gnu/packages/disk.scm \
- gnu/packages/djvu.scm \
- gnu/packages/dns.scm \
- gnu/packages/docbook.scm \
- gnu/packages/docker.scm \
- gnu/packages/doxygen.scm \
- gnu/packages/dunst.scm \
- gnu/packages/dvtm.scm \
- gnu/packages/ebook.scm \
- gnu/packages/ed.scm \
- gnu/packages/elf.scm \
- gnu/packages/emacs.scm \
- gnu/packages/enchant.scm \
- gnu/packages/engineering.scm \
- gnu/packages/enlightenment.scm \
- gnu/packages/fcitx.scm \
- gnu/packages/feh.scm \
- gnu/packages/figlet.scm \
- gnu/packages/file.scm \
- gnu/packages/finance.scm \
- gnu/packages/firmware.scm \
- gnu/packages/fish.scm \
- gnu/packages/flashing-tools.scm \
- gnu/packages/flex.scm \
- gnu/packages/fltk.scm \
- gnu/packages/fonts.scm \
- gnu/packages/fontutils.scm \
- gnu/packages/freedesktop.scm \
- gnu/packages/freeipmi.scm \
- gnu/packages/ftp.scm \
- gnu/packages/fribidi.scm \
- gnu/packages/fvwm.scm \
- gnu/packages/game-development.scm \
- gnu/packages/games.scm \
- gnu/packages/gawk.scm \
- gnu/packages/gcal.scm \
- gnu/packages/gcc.scm \
- gnu/packages/gd.scm \
- gnu/packages/gdb.scm \
- gnu/packages/geeqie.scm \
- gnu/packages/gettext.scm \
- gnu/packages/ghostscript.scm \
- gnu/packages/gimp.scm \
- gnu/packages/gkrellm.scm \
- gnu/packages/gl.scm \
- gnu/packages/glib.scm \
- gnu/packages/gnome.scm \
- gnu/packages/gnu-doc.scm \
- gnu/packages/gnucash.scm \
- gnu/packages/gnunet.scm \
- gnu/packages/gnupg.scm \
- gnu/packages/gnustep.scm \
- gnu/packages/gnuzilla.scm \
- gnu/packages/gnu-pw-mgr.scm \
- gnu/packages/gperf.scm \
- gnu/packages/gprolog.scm \
- gnu/packages/gps.scm \
- gnu/packages/graphics.scm \
- gnu/packages/graphviz.scm \
- gnu/packages/groff.scm \
- gnu/packages/grub.scm \
- gnu/packages/grue-hunter.scm \
- gnu/packages/gsasl.scm \
- gnu/packages/gstreamer.scm \
- gnu/packages/gtk.scm \
- gnu/packages/guile.scm \
- gnu/packages/guile-wm.scm \
- gnu/packages/gv.scm \
- gnu/packages/gxmessage.scm \
- gnu/packages/haskell.scm \
- gnu/packages/hugs.scm \
- gnu/packages/hurd.scm \
- gnu/packages/ibus.scm \
- gnu/packages/icu4c.scm \
- gnu/packages/idutils.scm \
- gnu/packages/image.scm \
- gnu/packages/imagemagick.scm \
- gnu/packages/indent.scm \
- gnu/packages/inklingreader.scm \
- gnu/packages/inkscape.scm \
- gnu/packages/irc.scm \
- gnu/packages/iso-codes.scm \
- gnu/packages/java.scm \
- gnu/packages/jemalloc.scm \
- gnu/packages/jrnl.scm \
- gnu/packages/julia.scm \
- gnu/packages/kde.scm \
- gnu/packages/kde-frameworks.scm \
- gnu/packages/key-mon.scm \
- gnu/packages/kodi.scm \
- gnu/packages/language.scm \
- gnu/packages/ldc.scm \
- gnu/packages/lego.scm \
- gnu/packages/less.scm \
- gnu/packages/lesstif.scm \
- gnu/packages/libcanberra.scm \
- gnu/packages/libdaemon.scm \
- gnu/packages/libedit.scm \
- gnu/packages/libevent.scm \
- gnu/packages/libffcall.scm \
- gnu/packages/libffi.scm \
- gnu/packages/libftdi.scm \
- gnu/packages/calendar.scm \
- gnu/packages/libidn.scm \
- gnu/packages/libphidget.scm \
- gnu/packages/libreoffice.scm \
- gnu/packages/libsigsegv.scm \
- gnu/packages/libunistring.scm \
- gnu/packages/libusb.scm \
- gnu/packages/libunwind.scm \
- gnu/packages/libupnp.scm \
- gnu/packages/lightning.scm \
- gnu/packages/links.scm \
- gnu/packages/linux.scm \
- gnu/packages/lirc.scm \
- gnu/packages/lisp.scm \
- gnu/packages/llvm.scm \
- gnu/packages/lout.scm \
- gnu/packages/lsh.scm \
- gnu/packages/lsof.scm \
- gnu/packages/lua.scm \
- gnu/packages/lxde.scm \
- gnu/packages/lxqt.scm \
- gnu/packages/lynx.scm \
- gnu/packages/m4.scm \
- gnu/packages/machine-learning.scm \
- gnu/packages/man.scm \
- gnu/packages/mail.scm \
- gnu/packages/make-bootstrap.scm \
- gnu/packages/markdown.scm \
- gnu/packages/mate.scm \
- gnu/packages/maths.scm \
- gnu/packages/mc.scm \
- gnu/packages/mcrypt.scm \
- gnu/packages/messaging.scm \
- gnu/packages/mg.scm \
- gnu/packages/mit-krb5.scm \
- gnu/packages/moe.scm \
- gnu/packages/moreutils.scm \
- gnu/packages/mpd.scm \
- gnu/packages/mp3.scm \
- gnu/packages/mpi.scm \
- gnu/packages/multiprecision.scm \
- gnu/packages/music.scm \
- gnu/packages/mtools.scm \
- gnu/packages/nano.scm \
- gnu/packages/ncdu.scm \
- gnu/packages/ncurses.scm \
- gnu/packages/netpbm.scm \
- gnu/packages/nettle.scm \
- gnu/packages/networking.scm \
- gnu/packages/ninja.scm \
- gnu/packages/node.scm \
- gnu/packages/noweb.scm \
- gnu/packages/ntp.scm \
- gnu/packages/nutrition.scm \
- gnu/packages/nvi.scm \
- gnu/packages/ocaml.scm \
- gnu/packages/ocr.scm \
- gnu/packages/onc-rpc.scm \
- gnu/packages/openbox.scm \
- gnu/packages/openldap.scm \
- gnu/packages/openstack.scm \
- gnu/packages/orpheus.scm \
- gnu/packages/ots.scm \
- gnu/packages/owncloud.scm \
- gnu/packages/package-management.scm \
- gnu/packages/parallel.scm \
- gnu/packages/password-utils.scm \
- gnu/packages/patchutils.scm \
- gnu/packages/pciutils.scm \
- gnu/packages/pcre.scm \
- gnu/packages/pdf.scm \
- gnu/packages/pem.scm \
- gnu/packages/perl.scm \
- gnu/packages/photo.scm \
- gnu/packages/pkg-config.scm \
- gnu/packages/plotutils.scm \
- gnu/packages/polkit.scm \
- gnu/packages/popt.scm \
- gnu/packages/pth.scm \
- gnu/packages/pulseaudio.scm \
- gnu/packages/pumpio.scm \
- gnu/packages/pretty-print.scm \
- gnu/packages/protobuf.scm \
- gnu/packages/pv.scm \
- gnu/packages/python.scm \
- gnu/packages/qemu.scm \
- gnu/packages/qt.scm \
- gnu/packages/ragel.scm \
- gnu/packages/ratpoison.scm \
- gnu/packages/rc.scm \
- gnu/packages/rdesktop.scm \
- gnu/packages/rdf.scm \
- gnu/packages/readline.scm \
- gnu/packages/rrdtool.scm \
- gnu/packages/rsync.scm \
- gnu/packages/ruby.scm \
- gnu/packages/rush.scm \
- gnu/packages/samba.scm \
- gnu/packages/sawfish.scm \
- gnu/packages/scanner.scm \
- gnu/packages/scheme.scm \
- gnu/packages/screen.scm \
- gnu/packages/scribus.scm \
- gnu/packages/sdl.scm \
- gnu/packages/search.scm \
- gnu/packages/serialization.scm \
- gnu/packages/serveez.scm \
- gnu/packages/shishi.scm \
- gnu/packages/skarnet.scm \
- gnu/packages/skribilo.scm \
- gnu/packages/slang.scm \
- gnu/packages/slim.scm \
- gnu/packages/smalltalk.scm \
- gnu/packages/ssh.scm \
- gnu/packages/stalonetray.scm \
- gnu/packages/statistics.scm \
- gnu/packages/suckless.scm \
- gnu/packages/swig.scm \
- gnu/packages/sxiv.scm \
- gnu/packages/synergy.scm \
- gnu/packages/task-management.scm \
- gnu/packages/tbb.scm \
- gnu/packages/tcl.scm \
- gnu/packages/tcsh.scm \
- gnu/packages/telephony.scm \
- gnu/packages/terminals.scm \
- gnu/packages/texinfo.scm \
- gnu/packages/texlive.scm \
- gnu/packages/textutils.scm \
- gnu/packages/time.scm \
- gnu/packages/tls.scm \
- gnu/packages/tmux.scm \
- gnu/packages/tor.scm \
- gnu/packages/tre.scm \
- gnu/packages/tv.scm \
- gnu/packages/unrtf.scm \
- gnu/packages/upnp.scm \
- gnu/packages/uucp.scm \
- gnu/packages/valgrind.scm \
- gnu/packages/version-control.scm \
- gnu/packages/video.scm \
- gnu/packages/vim.scm \
- gnu/packages/vpn.scm \
- gnu/packages/vtk.scm \
- gnu/packages/w3m.scm \
- gnu/packages/wdiff.scm \
- gnu/packages/web.scm \
- gnu/packages/webkit.scm \
- gnu/packages/wget.scm \
- gnu/packages/wicd.scm \
- gnu/packages/wine.scm \
- gnu/packages/wm.scm \
- gnu/packages/wordnet.scm \
- gnu/packages/wv.scm \
- gnu/packages/wxwidgets.scm \
- gnu/packages/xfig.scm \
- gnu/packages/xiph.scm \
- gnu/packages/xml.scm \
- gnu/packages/xnee.scm \
- gnu/packages/xdisorg.scm \
- gnu/packages/xorg.scm \
- gnu/packages/xfce.scm \
- gnu/packages/yasm.scm \
- gnu/packages/yubico.scm \
- gnu/packages/zile.scm \
- gnu/packages/zip.scm \
- gnu/packages/zsh.scm \
- \
- gnu/services.scm \
- gnu/services/avahi.scm \
- gnu/services/base.scm \
- gnu/services/databases.scm \
- gnu/services/dbus.scm \
- gnu/services/desktop.scm \
- gnu/services/lirc.scm \
- gnu/services/mail.scm \
- gnu/services/networking.scm \
- gnu/services/shepherd.scm \
- gnu/services/herd.scm \
- gnu/services/ssh.scm \
- gnu/services/web.scm \
- gnu/services/xorg.scm \
- \
- gnu/system.scm \
- gnu/system/file-systems.scm \
- gnu/system/grub.scm \
- gnu/system/install.scm \
- gnu/system/linux-container.scm \
- gnu/system/linux-initrd.scm \
- gnu/system/locale.scm \
- gnu/system/nss.scm \
- gnu/system/pam.scm \
- gnu/system/shadow.scm \
- gnu/system/vm.scm \
- \
- gnu/build/activation.scm \
- gnu/build/file-systems.scm \
- gnu/build/install.scm \
- gnu/build/linux-boot.scm \
- gnu/build/linux-container.scm \
- gnu/build/linux-initrd.scm \
- gnu/build/linux-modules.scm \
- gnu/build/vm.scm
-
-
-patchdir = $(guilemoduledir)/gnu/packages/patches
-dist_patch_DATA = \
- gnu/packages/patches/abiword-explictly-cast-bools.patch \
- gnu/packages/patches/abiword-link-plugins-against-backend.patch \
- gnu/packages/patches/abiword-no-include-glib-internal-headers.patch \
- gnu/packages/patches/abiword-pass-no-undefined-to-linker.patch \
- gnu/packages/patches/abiword-use-proper-png-api.patch \
- gnu/packages/patches/abiword-wmf-version-lookup-fix.patch \
- gnu/packages/patches/acl-hurd-path-max.patch \
- gnu/packages/patches/aegis-constness-error.patch \
- gnu/packages/patches/aegis-perl-tempdir1.patch \
- gnu/packages/patches/aegis-perl-tempdir2.patch \
- gnu/packages/patches/aegis-test-fixup-1.patch \
- gnu/packages/patches/aegis-test-fixup-2.patch \
- gnu/packages/patches/agg-am_c_prototype.patch \
- gnu/packages/patches/alsa-lib-mips-atomic-fix.patch \
- gnu/packages/patches/apr-skip-getservbyname-test.patch \
- gnu/packages/patches/arb-ldconfig.patch \
- gnu/packages/patches/asymptote-gsl2.patch \
- gnu/packages/patches/ath9k-htc-firmware-binutils.patch \
- gnu/packages/patches/ath9k-htc-firmware-gcc.patch \
- gnu/packages/patches/ath9k-htc-firmware-objcopy.patch \
- gnu/packages/patches/audacity-fix-ffmpeg-binding.patch \
- gnu/packages/patches/automake-skip-amhello-tests.patch \
- gnu/packages/patches/automake-regexp-syntax.patch \
- gnu/packages/patches/avahi-localstatedir.patch \
- gnu/packages/patches/avidemux-install-to-lib.patch \
- gnu/packages/patches/avrdude-fix-libusb.patch \
- gnu/packages/patches/bash-completion-directories.patch \
- gnu/packages/patches/bigloo-gc-shebangs.patch \
- gnu/packages/patches/binutils-ld-new-dtags.patch \
- gnu/packages/patches/binutils-loongson-workaround.patch \
- gnu/packages/patches/byobu-writable-status.patch \
- gnu/packages/patches/calibre-drop-unrar.patch \
- gnu/packages/patches/calibre-no-updates-dialog.patch \
- gnu/packages/patches/cdparanoia-fpic.patch \
- gnu/packages/patches/chmlib-inttypes.patch \
- gnu/packages/patches/clang-libc-search-path.patch \
- gnu/packages/patches/clucene-pkgconfig.patch \
- gnu/packages/patches/cmake-fix-tests.patch \
- gnu/packages/patches/cpio-gets-undeclared.patch \
- gnu/packages/patches/cpio-CVE-2016-2037.patch \
- gnu/packages/patches/cpufrequtils-fix-aclocal.patch \
- gnu/packages/patches/crda-optional-gcrypt.patch \
- gnu/packages/patches/crossmap-allow-system-pysam.patch \
- gnu/packages/patches/csound-header-ordering.patch \
- gnu/packages/patches/cssc-gets-undeclared.patch \
- gnu/packages/patches/cssc-missing-include.patch \
- gnu/packages/patches/clucene-contribs-lib.patch \
- gnu/packages/patches/cursynth-wave-rand.patch \
- gnu/packages/patches/dbus-helper-search-path.patch \
- gnu/packages/patches/dealii-p4est-interface.patch \
- gnu/packages/patches/devil-fix-libpng.patch \
- gnu/packages/patches/dico-libtool-deterministic.patch \
- gnu/packages/patches/diffutils-gets-undeclared.patch \
- gnu/packages/patches/dfu-programmer-fix-libusb.patch \
- gnu/packages/patches/doxygen-test.patch \
- gnu/packages/patches/duplicity-piped-password.patch \
- gnu/packages/patches/duplicity-test_selection-tmp.patch \
- gnu/packages/patches/elfutils-tests-ptrace.patch \
- gnu/packages/patches/einstein-build.patch \
- gnu/packages/patches/emacs-constants-lisp-like.patch \
- gnu/packages/patches/emacs-exec-path.patch \
- gnu/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \
- gnu/packages/patches/emacs-source-date-epoch.patch \
- gnu/packages/patches/eudev-rules-directory.patch \
- gnu/packages/patches/evilwm-lost-focus-bug.patch \
- gnu/packages/patches/expat-CVE-2015-1283.patch \
- gnu/packages/patches/fastcap-mulGlobal.patch \
- gnu/packages/patches/fastcap-mulSetup.patch \
- gnu/packages/patches/fasthenry-spAllocate.patch \
- gnu/packages/patches/fasthenry-spBuild.patch \
- gnu/packages/patches/fasthenry-spUtils.patch \
- gnu/packages/patches/fasthenry-spSolve.patch \
- gnu/packages/patches/fasthenry-spFactor.patch \
- gnu/packages/patches/findutils-localstatedir.patch \
- gnu/packages/patches/findutils-test-xargs.patch \
- gnu/packages/patches/flashrom-use-libftdi1.patch \
- gnu/packages/patches/flint-ldconfig.patch \
- gnu/packages/patches/fltk-shared-lib-defines.patch \
- gnu/packages/patches/freeimage-CVE-2015-0852.patch \
- gnu/packages/patches/gawk-fts-test.patch \
- gnu/packages/patches/gawk-shell.patch \
- gnu/packages/patches/gcc-arm-link-spec-fix.patch \
- gnu/packages/patches/gcc-cross-environment-variables.patch \
- gnu/packages/patches/gcc-libvtv-runpath.patch \
- gnu/packages/patches/gcc-5.0-libvtv-runpath.patch \
- gnu/packages/patches/geoclue-config.patch \
- gnu/packages/patches/ghostscript-CVE-2015-3228.patch \
- gnu/packages/patches/ghostscript-runpath.patch \
- gnu/packages/patches/glib-networking-ssl-cert-file.patch \
- gnu/packages/patches/glib-tests-desktop.patch \
- gnu/packages/patches/glib-tests-homedir.patch \
- gnu/packages/patches/glib-tests-prlimit.patch \
- gnu/packages/patches/glib-tests-timer.patch \
- gnu/packages/patches/glib-tests-gapplication.patch \
- gnu/packages/patches/glibc-CVE-2015-7547.patch \
- gnu/packages/patches/glibc-bootstrap-system.patch \
- gnu/packages/patches/glibc-hurd-extern-inline.patch \
- gnu/packages/patches/glibc-ldd-x86_64.patch \
- gnu/packages/patches/glibc-locales.patch \
- gnu/packages/patches/glibc-locale-incompatibility.patch \
- gnu/packages/patches/glibc-o-largefile.patch \
- gnu/packages/patches/glibc-versioned-locpath.patch \
- gnu/packages/patches/gmp-arm-asm-nothumb.patch \
- gnu/packages/patches/gmp-faulty-test.patch \
- gnu/packages/patches/gnucash-price-quotes-perl.patch \
- gnu/packages/patches/gnupg-simple-query-ignore-status-messages.patch \
- gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \
- gnu/packages/patches/gobject-introspection-cc.patch \
- gnu/packages/patches/gobject-introspection-girepository.patch \
- gnu/packages/patches/grep-timing-sensitive-test.patch \
- gnu/packages/patches/grub-CVE-2015-8370.patch \
- gnu/packages/patches/grub-gets-undeclared.patch \
- gnu/packages/patches/grub-freetype.patch \
- gnu/packages/patches/guile-1.8-cpp-4.5.patch \
- gnu/packages/patches/guile-arm-fixes.patch \
- gnu/packages/patches/guile-default-utf8.patch \
- gnu/packages/patches/guile-linux-syscalls.patch \
- gnu/packages/patches/guile-present-coding.patch \
- gnu/packages/patches/guile-relocatable.patch \
- gnu/packages/patches/guile-rsvg-pkgconfig.patch \
- gnu/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
- gnu/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \
- gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
- gnu/packages/patches/hop-bigloo-4.0b.patch \
- gnu/packages/patches/hop-linker-flags.patch \
- gnu/packages/patches/hydra-automake-1.15.patch \
- gnu/packages/patches/hydra-disable-darcs-test.patch \
- gnu/packages/patches/icecat-avoid-bundled-includes.patch \
- gnu/packages/patches/icecat-update-graphite2.patch \
- gnu/packages/patches/icecat-update-graphite2-pt2.patch \
- gnu/packages/patches/icecat-re-enable-DHE-cipher-suites.patch \
- gnu/packages/patches/icecat-CVE-2015-4477.patch \
- gnu/packages/patches/icecat-CVE-2015-7207.patch \
- gnu/packages/patches/icecat-CVE-2016-1952-pt01.patch \
- gnu/packages/patches/icecat-CVE-2016-1952-pt02.patch \
- gnu/packages/patches/icecat-CVE-2016-1952-pt03.patch \
- gnu/packages/patches/icecat-CVE-2016-1952-pt04.patch \
- gnu/packages/patches/icecat-CVE-2016-1952-pt05.patch \
- gnu/packages/patches/icecat-CVE-2016-1952-pt06.patch \
- gnu/packages/patches/icecat-CVE-2016-1954.patch \
- gnu/packages/patches/icecat-CVE-2016-1960.patch \
- gnu/packages/patches/icecat-CVE-2016-1961.patch \
- gnu/packages/patches/icecat-CVE-2016-1962.patch \
- gnu/packages/patches/icecat-CVE-2016-1964.patch \
- gnu/packages/patches/icecat-CVE-2016-1965.patch \
- gnu/packages/patches/icecat-CVE-2016-1966.patch \
- gnu/packages/patches/icecat-CVE-2016-1974.patch \
- gnu/packages/patches/icecat-bug-1248851.patch \
- gnu/packages/patches/icu4c-CVE-2014-6585.patch \
- gnu/packages/patches/icu4c-CVE-2015-1270.patch \
- gnu/packages/patches/icu4c-CVE-2015-4760.patch \
- gnu/packages/patches/ilmbase-fix-tests.patch \
- gnu/packages/patches/imagemagick-test-segv.patch \
- gnu/packages/patches/irrlicht-mesa-10.patch \
- gnu/packages/patches/jasper-CVE-2007-2721.patch \
- gnu/packages/patches/jasper-CVE-2008-3520.patch \
- gnu/packages/patches/jasper-CVE-2008-3522.patch \
- gnu/packages/patches/jasper-CVE-2011-4516-and-CVE-2011-4517.patch \
- gnu/packages/patches/jasper-CVE-2014-8137.patch \
- gnu/packages/patches/jasper-CVE-2014-8138.patch \
- gnu/packages/patches/jasper-CVE-2014-8157.patch \
- gnu/packages/patches/jasper-CVE-2014-8158.patch \
- gnu/packages/patches/jasper-CVE-2014-9029.patch \
- gnu/packages/patches/jasper-CVE-2016-1577.patch \
- gnu/packages/patches/jasper-CVE-2016-1867.patch \
- gnu/packages/patches/jasper-CVE-2016-2089.patch \
- gnu/packages/patches/jasper-CVE-2016-2116.patch \
- gnu/packages/patches/jbig2dec-ignore-testtest.patch \
- gnu/packages/patches/kmod-module-directory.patch \
- gnu/packages/patches/ldc-disable-tests.patch \
- gnu/packages/patches/lftp-dont-save-unknown-host-fingerprint.patch \
- gnu/packages/patches/liba52-enable-pic.patch \
- gnu/packages/patches/liba52-link-with-libm.patch \
- gnu/packages/patches/liba52-set-soname.patch \
- gnu/packages/patches/liba52-use-mtune-not-mcpu.patch \
- gnu/packages/patches/libarchive-bsdtar-test.patch \
- gnu/packages/patches/libarchive-CVE-2013-0211.patch \
- gnu/packages/patches/libarchive-fix-lzo-test-case.patch \
- gnu/packages/patches/libarchive-mtree-filename-length-fix.patch \
- gnu/packages/patches/libbonobo-activation-test-race.patch \
- gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch \
- gnu/packages/patches/libcmis-fix-test-onedrive.patch \
- gnu/packages/patches/libdrm-symbol-check.patch \
- gnu/packages/patches/libevent-dns-tests.patch \
- gnu/packages/patches/libmtp-devices.patch \
- gnu/packages/patches/liboop-mips64-deplibs-fix.patch \
- gnu/packages/patches/libotr-test-auth-fix.patch \
- gnu/packages/patches/liblxqt-include.patch \
- gnu/packages/patches/libmad-armv7-thumb-pt1.patch \
- gnu/packages/patches/libmad-armv7-thumb-pt2.patch \
- gnu/packages/patches/libmad-frame-length.patch \
- gnu/packages/patches/libmad-mips-newgcc.patch \
- gnu/packages/patches/libssh-0.6.5-CVE-2016-0739.patch \
- gnu/packages/patches/libtheora-config-guess.patch \
- gnu/packages/patches/libtiff-CVE-2015-8665+CVE-2015-8683.patch \
- gnu/packages/patches/libtiff-oob-accesses-in-decode.patch \
- gnu/packages/patches/libtiff-oob-write-in-nextdecode.patch \
- gnu/packages/patches/libtool-skip-tests2.patch \
- gnu/packages/patches/libunwind-CVE-2015-3239.patch \
- gnu/packages/patches/libwmf-CAN-2004-0941.patch \
- gnu/packages/patches/libwmf-CVE-2006-3376.patch \
- gnu/packages/patches/libwmf-CVE-2007-0455.patch \
- gnu/packages/patches/libwmf-CVE-2007-2756.patch \
- gnu/packages/patches/libwmf-CVE-2007-3472.patch \
- gnu/packages/patches/libwmf-CVE-2007-3473.patch \
- gnu/packages/patches/libwmf-CVE-2007-3477.patch \
- gnu/packages/patches/libwmf-CVE-2009-1364.patch \
- gnu/packages/patches/libwmf-CVE-2009-3546.patch \
- gnu/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch \
- gnu/packages/patches/libwmf-CVE-2015-4695.patch \
- gnu/packages/patches/libwmf-CVE-2015-4696.patch \
- gnu/packages/patches/libxslt-CVE-2015-7995.patch \
- gnu/packages/patches/lirc-localstatedir.patch \
- gnu/packages/patches/libpthread-glibc-preparation.patch \
- gnu/packages/patches/lm-sensors-hwmon-attrs.patch \
- gnu/packages/patches/lua-pkgconfig.patch \
- gnu/packages/patches/lua51-liblua-so.patch \
- gnu/packages/patches/lua52-liblua-so.patch \
- gnu/packages/patches/luajit-no_ldconfig.patch \
- gnu/packages/patches/luajit-symlinks.patch \
- gnu/packages/patches/luit-posix.patch \
- gnu/packages/patches/m4-gets-undeclared.patch \
- gnu/packages/patches/make-impure-dirs.patch \
- gnu/packages/patches/mars-install.patch \
- gnu/packages/patches/mars-sfml-2.3.patch \
- gnu/packages/patches/matplotlib-setupext-tk.patch \
- gnu/packages/patches/maxima-defsystem-mkdir.patch \
- gnu/packages/patches/mcron-install.patch \
- gnu/packages/patches/mdadm-gcc-4.9-fix.patch \
- gnu/packages/patches/mhash-keygen-test-segfault.patch \
- gnu/packages/patches/mit-krb5-CVE-2015-8629.patch \
- gnu/packages/patches/mit-krb5-CVE-2015-8630.patch \
- gnu/packages/patches/mit-krb5-CVE-2015-8631.patch \
- gnu/packages/patches/mit-krb5-init-context-null-spnego.patch \
- gnu/packages/patches/mpc123-initialize-ao.patch \
- gnu/packages/patches/mplayer2-theora-fix.patch \
- gnu/packages/patches/module-init-tools-moduledir.patch \
- gnu/packages/patches/mumps-build-parallelism.patch \
- gnu/packages/patches/mupen64plus-ui-console-notice.patch \
- gnu/packages/patches/mutt-store-references.patch \
- gnu/packages/patches/net-tools-bitrot.patch \
- gnu/packages/patches/ngircd-handle-zombies.patch \
- gnu/packages/patches/ngircd-no-dns-in-tests.patch \
- gnu/packages/patches/ninja-tests.patch \
- gnu/packages/patches/ninja-zero-mtime.patch \
- gnu/packages/patches/nss-pkgconfig.patch \
- gnu/packages/patches/nvi-assume-preserve-path.patch \
- gnu/packages/patches/nvi-dbpagesize-binpower.patch \
- gnu/packages/patches/nvi-db4.patch \
- gnu/packages/patches/ocaml-findlib-make-install.patch \
- gnu/packages/patches/openexr-missing-samples.patch \
- gnu/packages/patches/openimageio-boost-1.60.patch \
- gnu/packages/patches/openjpeg-CVE-2015-6581.patch \
- gnu/packages/patches/openjpeg-use-after-free-fix.patch \
- gnu/packages/patches/openssl-runpath.patch \
- gnu/packages/patches/openssl-c-rehash-in.patch \
- gnu/packages/patches/orpheus-cast-errors-and-includes.patch \
- gnu/packages/patches/ots-no-include-missing-file.patch \
- gnu/packages/patches/patchelf-page-size.patch \
- gnu/packages/patches/patchelf-rework-for-arm.patch \
- gnu/packages/patches/patchutils-xfail-gendiff-tests.patch \
- gnu/packages/patches/patch-hurd-path-max.patch \
- gnu/packages/patches/perl-CVE-2015-8607.patch \
- gnu/packages/patches/perl-CVE-2016-2381.patch \
- gnu/packages/patches/perl-autosplit-default-time.patch \
- gnu/packages/patches/perl-deterministic-ordering.patch \
- gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
- gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch \
- gnu/packages/patches/perl-io-socket-ssl-openssl-1.0.2f-fix.patch \
- gnu/packages/patches/perl-net-amazon-s3-moose-warning.patch \
- gnu/packages/patches/perl-net-ssleay-disable-ede-test.patch \
- gnu/packages/patches/perl-no-build-time.patch \
- gnu/packages/patches/perl-no-sys-dirs.patch \
- gnu/packages/patches/perl-module-pluggable-search.patch \
- gnu/packages/patches/perl-source-date-epoch.patch \
- gnu/packages/patches/pidgin-add-search-path.patch \
- gnu/packages/patches/pinball-const-fix.patch \
- gnu/packages/patches/pinball-cstddef.patch \
- gnu/packages/patches/pinball-missing-separators.patch \
- gnu/packages/patches/pinball-src-deps.patch \
- gnu/packages/patches/pinball-system-ltdl.patch \
- gnu/packages/patches/pingus-sdl-libs-config.patch \
- gnu/packages/patches/plink-1.07-unclobber-i.patch \
- gnu/packages/patches/plotutils-libpng-jmpbuf.patch \
- gnu/packages/patches/polkit-drop-test.patch \
- gnu/packages/patches/portaudio-audacity-compat.patch \
- gnu/packages/patches/procmail-ambiguous-getline-debian.patch \
- gnu/packages/patches/pt-scotch-build-parallelism.patch \
- gnu/packages/patches/pulseaudio-fix-mult-test.patch \
- gnu/packages/patches/pulseaudio-longer-test-timeout.patch \
- gnu/packages/patches/pycairo-wscript.patch \
- gnu/packages/patches/pybugz-encode-error.patch \
- gnu/packages/patches/pybugz-stty.patch \
- gnu/packages/patches/pygpgme-disable-problematic-tests.patch \
- gnu/packages/patches/pyqt-configure.patch \
- gnu/packages/patches/python-2-deterministic-build-info.patch \
- gnu/packages/patches/python-2.7-search-paths.patch \
- gnu/packages/patches/python-2.7-source-date-epoch.patch \
- gnu/packages/patches/python-3-deterministic-build-info.patch \
- gnu/packages/patches/python-3-search-paths.patch \
- gnu/packages/patches/python-disable-ssl-test.patch \
- gnu/packages/patches/python-fix-tests.patch \
- gnu/packages/patches/python-ipython-inputhook-ctype.patch \
- gnu/packages/patches/python-rarfile-fix-tests.patch \
- gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
- gnu/packages/patches/python-configobj-setuptools.patch \
- gnu/packages/patches/python-paste-remove-website-test.patch \
- gnu/packages/patches/python-paste-remove-timing-test.patch \
- gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
- gnu/packages/patches/qemu-CVE-2015-8558.patch \
- gnu/packages/patches/qemu-CVE-2015-8567.patch \
- gnu/packages/patches/qemu-CVE-2015-8613.patch \
- gnu/packages/patches/qemu-CVE-2015-8619.patch \
- gnu/packages/patches/qemu-CVE-2015-8701.patch \
- gnu/packages/patches/qemu-CVE-2015-8743.patch \
- gnu/packages/patches/qemu-CVE-2016-1568.patch \
- gnu/packages/patches/qemu-CVE-2016-1922.patch \
- gnu/packages/patches/qemu-CVE-2016-1981.patch \
- gnu/packages/patches/qemu-CVE-2016-2197.patch \
- gnu/packages/patches/qemu-usb-ehci-oob-read.patch \
- gnu/packages/patches/qemu-virtio-9p-use-accessor-to-get-thread-pool.patch \
- gnu/packages/patches/qt4-ldflags.patch \
- gnu/packages/patches/ratpoison-shell.patch \
- gnu/packages/patches/readline-link-ncurses.patch \
- gnu/packages/patches/ripperx-missing-file.patch \
- gnu/packages/patches/rsem-makefile.patch \
- gnu/packages/patches/sed-hurd-path-max.patch \
- gnu/packages/patches/scheme48-tests.patch \
- gnu/packages/patches/scotch-test-threading.patch \
- gnu/packages/patches/sdl-libx11-1.6.patch \
- gnu/packages/patches/serf-comment-style-fix.patch \
- gnu/packages/patches/serf-deflate-buckets-test-fix.patch \
- gnu/packages/patches/slim-session.patch \
- gnu/packages/patches/slim-config.patch \
- gnu/packages/patches/slim-sigusr1.patch \
- gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch \
- gnu/packages/patches/soprano-find-clucene.patch \
- gnu/packages/patches/sudo-CVE-2015-5602.patch \
- gnu/packages/patches/superlu-dist-scotchmetis.patch \
- gnu/packages/patches/synfig-build-fix.patch \
- gnu/packages/patches/tar-d_ino_in_dirent-fix.patch \
- gnu/packages/patches/tar-skip-unreliable-tests.patch \
- gnu/packages/patches/tcl-mkindex-deterministic.patch \
- gnu/packages/patches/tclxml-3.2-install.patch \
- gnu/packages/patches/tcsh-fix-autotest.patch \
- gnu/packages/patches/texi2html-document-encoding.patch \
- gnu/packages/patches/texi2html-i18n.patch \
- gnu/packages/patches/tidy-CVE-2015-5522+5523.patch \
- gnu/packages/patches/tinyxml-use-stl.patch \
- gnu/packages/patches/tk-find-library.patch \
- gnu/packages/patches/tophat-build-with-later-seqan.patch \
- gnu/packages/patches/torsocks-dns-test.patch \
- gnu/packages/patches/tvtime-gcc41.patch \
- gnu/packages/patches/tvtime-pngoutput.patch \
- gnu/packages/patches/tvtime-videodev2.patch \
- gnu/packages/patches/tvtime-xmltv.patch \
- gnu/packages/patches/unzip-CVE-2014-8139.patch \
- gnu/packages/patches/unzip-CVE-2014-8140.patch \
- gnu/packages/patches/unzip-CVE-2014-8141.patch \
- gnu/packages/patches/unzip-CVE-2014-9636.patch \
- gnu/packages/patches/unzip-CVE-2015-7696.patch \
- gnu/packages/patches/unzip-CVE-2015-7697.patch \
- gnu/packages/patches/unzip-allow-greater-hostver-values.patch \
- gnu/packages/patches/unzip-attribs-overflow.patch \
- gnu/packages/patches/unzip-overflow-on-invalid-input.patch \
- gnu/packages/patches/unzip-format-secure.patch \
- gnu/packages/patches/unzip-initialize-symlink-flag.patch \
- gnu/packages/patches/unzip-overflow-long-fsize.patch \
- gnu/packages/patches/unzip-remove-build-date.patch \
- gnu/packages/patches/util-linux-tests.patch \
- gnu/packages/patches/upower-builddir.patch \
- gnu/packages/patches/valgrind-enable-arm.patch \
- gnu/packages/patches/vorbis-tools-CVE-2015-6749.patch \
- gnu/packages/patches/vpnc-script.patch \
- gnu/packages/patches/vtk-mesa-10.patch \
- gnu/packages/patches/w3m-libgc.patch \
- gnu/packages/patches/w3m-force-ssl_verify_server-on.patch \
- gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch \
- gnu/packages/patches/w3m-disable-weak-ciphers.patch \
- gnu/packages/patches/weechat-python.patch \
- gnu/packages/patches/weex-vacopy.patch \
- gnu/packages/patches/wicd-bitrate-none-fix.patch \
- gnu/packages/patches/wicd-get-selected-profile-fix.patch \
- gnu/packages/patches/wicd-urwid-1.3.patch \
- gnu/packages/patches/wicd-wpa2-ttls.patch \
- gnu/packages/patches/wmctrl-64-fix.patch \
- gnu/packages/patches/wpa-supplicant-CVE-2015-5310.patch \
- gnu/packages/patches/wpa-supplicant-CVE-2015-5314.patch \
- gnu/packages/patches/wpa-supplicant-CVE-2015-5315.patch \
- gnu/packages/patches/wpa-supplicant-CVE-2015-5316.patch \
- gnu/packages/patches/xdotool-fix-makefile.patch \
- gnu/packages/patches/xf86-video-ark-remove-mibstore.patch \
- gnu/packages/patches/xf86-video-ast-remove-mibstore.patch \
- gnu/packages/patches/xf86-video-geode-glibc-2.20.patch \
- gnu/packages/patches/xf86-video-glint-remove-mibstore.patch \
- gnu/packages/patches/xf86-video-i128-remove-mibstore.patch \
- gnu/packages/patches/xf86-video-intel-compat-api.patch \
- gnu/packages/patches/xf86-video-intel-glibc-2.20.patch \
- gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch \
- gnu/packages/patches/xf86-video-nv-remove-mibstore.patch \
- gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch \
- gnu/packages/patches/xf86-video-tga-remove-mibstore.patch \
- gnu/packages/patches/xfce4-panel-plugins.patch \
- gnu/packages/patches/xfce4-session-fix-xflock4.patch \
- gnu/packages/patches/xfce4-settings-defaults.patch \
- gnu/packages/patches/xmodmap-asprintf.patch \
- gnu/packages/patches/zathura-plugindir-environment-variable.patch
-
-MISC_DISTRO_FILES = \
- gnu/packages/ld-wrapper.in
-
-bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
-bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux
-bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux
-bootstrap_armhf_linuxdir = $(bootstrapdir)/armhf-linux
-bootstrap_mips64el_linuxdir = $(bootstrapdir)/mips64el-linux
-
-dist_bootstrap_x86_64_linux_DATA = \
- gnu/packages/bootstrap/x86_64-linux/bash \
- gnu/packages/bootstrap/x86_64-linux/mkdir \
- gnu/packages/bootstrap/x86_64-linux/tar \
- gnu/packages/bootstrap/x86_64-linux/xz
-
-dist_bootstrap_i686_linux_DATA = \
- gnu/packages/bootstrap/i686-linux/bash \
- gnu/packages/bootstrap/i686-linux/mkdir \
- gnu/packages/bootstrap/i686-linux/tar \
- gnu/packages/bootstrap/i686-linux/xz
-
-dist_bootstrap_armhf_linux_DATA = \
- gnu/packages/bootstrap/armhf-linux/bash \
- gnu/packages/bootstrap/armhf-linux/mkdir \
- gnu/packages/bootstrap/armhf-linux/tar \
- gnu/packages/bootstrap/armhf-linux/xz
-
-dist_bootstrap_mips64el_linux_DATA = \
- gnu/packages/bootstrap/mips64el-linux/bash \
- gnu/packages/bootstrap/mips64el-linux/mkdir \
- gnu/packages/bootstrap/mips64el-linux/tar \
- gnu/packages/bootstrap/mips64el-linux/xz
-
-# Big bootstrap binaries are not included in the tarball. Instead, they
-# are downloaded.
-nodist_bootstrap_x86_64_linux_DATA = \
- gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz
-nodist_bootstrap_i686_linux_DATA = \
- gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz
-nodist_bootstrap_armhf_linux_DATA = \
- gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz
-nodist_bootstrap_mips64el_linux_DATA = \
- gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz
-
-# Those files must remain executable, so they remain executable once
-# imported into the store.
-set-bootstrap-executable-permissions:
- chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz}
-
-DISTCLEANFILES = \
- $(nodist_bootstrap_x86_64_linux_DATA) \
- $(nodist_bootstrap_i686_linux_DATA) \
- $(nodist_bootstrap_armhf_linux_DATA) \
- $(nodist_bootstrap_mips64el_linux_DATA)
-
-# Method to download a file from an external source.
-DOWNLOAD_FILE = \
- GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH" \
- $(GUILE) --no-auto-compile -L "$(top_builddir)" -L "$(top_srcdir)" \
- "$(top_srcdir)/build-aux/download.scm"
-
-gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz:
- $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
- $(DOWNLOAD_FILE) "$@" \
- "037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0"
-gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz:
- $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
- $(DOWNLOAD_FILE) "$@" \
- "b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846"
-gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz:
- $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
- $(DOWNLOAD_FILE) "$@" \
- "e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6"
-gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz:
- $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
- $(DOWNLOAD_FILE) "$@" \
- "994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b"
diff --git a/gnu/local.mk b/gnu/local.mk
new file mode 100644
index 0000000..d883cdc
--- /dev/null
+++ b/gnu/local.mk
@@ -0,0 +1,883 @@
+# GNU Guix --- Functional package management for GNU
+# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
+# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
+# Copyright © 2013, 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
+#
+# 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/>.
+
+# Definitions for the GNU System: package modules, patches, bootstrap
+# binaries.
+
+GNU_SYSTEM_MODULES = \
+ gnu.scm \
+ gnu/artwork.scm \
+ gnu/packages.scm \
+ gnu/packages/abduco.scm \
+ gnu/packages/abiword.scm \
+ gnu/packages/acct.scm \
+ gnu/packages/acl.scm \
+ gnu/packages/admin.scm \
+ gnu/packages/adns.scm \
+ gnu/packages/algebra.scm \
+ gnu/packages/aidc.scm \
+ gnu/packages/animation.scm \
+ gnu/packages/apl.scm \
+ gnu/packages/apr.scm \
+ gnu/packages/asciidoc.scm \
+ gnu/packages/aspell.scm \
+ gnu/packages/attr.scm \
+ gnu/packages/audacity.scm \
+ gnu/packages/audio.scm \
+ gnu/packages/augeas.scm \
+ gnu/packages/autogen.scm \
+ gnu/packages/autotools.scm \
+ gnu/packages/avahi.scm \
+ gnu/packages/avr.scm \
+ gnu/packages/backup.scm \
+ gnu/packages/base.scm \
+ gnu/packages/bash.scm \
+ gnu/packages/bdw-gc.scm \
+ gnu/packages/bioinformatics.scm \
+ gnu/packages/bittorrent.scm \
+ gnu/packages/bison.scm \
+ gnu/packages/boost.scm \
+ gnu/packages/bootstrap.scm \
+ gnu/packages/busybox.scm \
+ gnu/packages/calcurse.scm \
+ gnu/packages/ccache.scm \
+ gnu/packages/cdrom.scm \
+ gnu/packages/certs.scm \
+ gnu/packages/check.scm \
+ gnu/packages/ci.scm \
+ gnu/packages/cmake.scm \
+ gnu/packages/code.scm \
+ gnu/packages/commencement.scm \
+ gnu/packages/compression.scm \
+ gnu/packages/conkeror.scm \
+ gnu/packages/conky.scm \
+ gnu/packages/cook.scm \
+ gnu/packages/cpio.scm \
+ gnu/packages/cppi.scm \
+ gnu/packages/cross-base.scm \
+ gnu/packages/crypto.scm \
+ gnu/packages/cryptsetup.scm \
+ gnu/packages/cups.scm \
+ gnu/packages/curl.scm \
+ gnu/packages/cyrus-sasl.scm \
+ gnu/packages/databases.scm \
+ gnu/packages/datamash.scm \
+ gnu/packages/datastructures.scm \
+ gnu/packages/dav.scm \
+ gnu/packages/dc.scm \
+ gnu/packages/debug.scm \
+ gnu/packages/dejagnu.scm \
+ gnu/packages/dico.scm \
+ gnu/packages/dictionaries.scm \
+ gnu/packages/disk.scm \
+ gnu/packages/djvu.scm \
+ gnu/packages/dns.scm \
+ gnu/packages/docbook.scm \
+ gnu/packages/docker.scm \
+ gnu/packages/doxygen.scm \
+ gnu/packages/dunst.scm \
+ gnu/packages/dvtm.scm \
+ gnu/packages/ebook.scm \
+ gnu/packages/ed.scm \
+ gnu/packages/elf.scm \
+ gnu/packages/emacs.scm \
+ gnu/packages/enchant.scm \
+ gnu/packages/engineering.scm \
+ gnu/packages/enlightenment.scm \
+ gnu/packages/fcitx.scm \
+ gnu/packages/feh.scm \
+ gnu/packages/figlet.scm \
+ gnu/packages/file.scm \
+ gnu/packages/finance.scm \
+ gnu/packages/firmware.scm \
+ gnu/packages/fish.scm \
+ gnu/packages/flashing-tools.scm \
+ gnu/packages/flex.scm \
+ gnu/packages/fltk.scm \
+ gnu/packages/fonts.scm \
+ gnu/packages/fontutils.scm \
+ gnu/packages/freedesktop.scm \
+ gnu/packages/freeipmi.scm \
+ gnu/packages/ftp.scm \
+ gnu/packages/fribidi.scm \
+ gnu/packages/fvwm.scm \
+ gnu/packages/game-development.scm \
+ gnu/packages/games.scm \
+ gnu/packages/gawk.scm \
+ gnu/packages/gcal.scm \
+ gnu/packages/gcc.scm \
+ gnu/packages/gd.scm \
+ gnu/packages/gdb.scm \
+ gnu/packages/geeqie.scm \
+ gnu/packages/gettext.scm \
+ gnu/packages/ghostscript.scm \
+ gnu/packages/gimp.scm \
+ gnu/packages/gkrellm.scm \
+ gnu/packages/gl.scm \
+ gnu/packages/glib.scm \
+ gnu/packages/gnome.scm \
+ gnu/packages/gnu-doc.scm \
+ gnu/packages/gnucash.scm \
+ gnu/packages/gnunet.scm \
+ gnu/packages/gnupg.scm \
+ gnu/packages/gnustep.scm \
+ gnu/packages/gnuzilla.scm \
+ gnu/packages/gnu-pw-mgr.scm \
+ gnu/packages/gperf.scm \
+ gnu/packages/gprolog.scm \
+ gnu/packages/gps.scm \
+ gnu/packages/graphics.scm \
+ gnu/packages/graphviz.scm \
+ gnu/packages/groff.scm \
+ gnu/packages/grub.scm \
+ gnu/packages/grue-hunter.scm \
+ gnu/packages/gsasl.scm \
+ gnu/packages/gstreamer.scm \
+ gnu/packages/gtk.scm \
+ gnu/packages/guile.scm \
+ gnu/packages/guile-wm.scm \
+ gnu/packages/gv.scm \
+ gnu/packages/gxmessage.scm \
+ gnu/packages/haskell.scm \
+ gnu/packages/hugs.scm \
+ gnu/packages/hurd.scm \
+ gnu/packages/ibus.scm \
+ gnu/packages/icu4c.scm \
+ gnu/packages/idutils.scm \
+ gnu/packages/image.scm \
+ gnu/packages/imagemagick.scm \
+ gnu/packages/indent.scm \
+ gnu/packages/inklingreader.scm \
+ gnu/packages/inkscape.scm \
+ gnu/packages/irc.scm \
+ gnu/packages/iso-codes.scm \
+ gnu/packages/java.scm \
+ gnu/packages/jemalloc.scm \
+ gnu/packages/jrnl.scm \
+ gnu/packages/julia.scm \
+ gnu/packages/kde.scm \
+ gnu/packages/kde-frameworks.scm \
+ gnu/packages/key-mon.scm \
+ gnu/packages/kodi.scm \
+ gnu/packages/language.scm \
+ gnu/packages/ldc.scm \
+ gnu/packages/lego.scm \
+ gnu/packages/less.scm \
+ gnu/packages/lesstif.scm \
+ gnu/packages/libcanberra.scm \
+ gnu/packages/libdaemon.scm \
+ gnu/packages/libedit.scm \
+ gnu/packages/libevent.scm \
+ gnu/packages/libffcall.scm \
+ gnu/packages/libffi.scm \
+ gnu/packages/libftdi.scm \
+ gnu/packages/calendar.scm \
+ gnu/packages/libidn.scm \
+ gnu/packages/libphidget.scm \
+ gnu/packages/libreoffice.scm \
+ gnu/packages/libsigsegv.scm \
+ gnu/packages/libunistring.scm \
+ gnu/packages/libusb.scm \
+ gnu/packages/libunwind.scm \
+ gnu/packages/libupnp.scm \
+ gnu/packages/lightning.scm \
+ gnu/packages/links.scm \
+ gnu/packages/linux.scm \
+ gnu/packages/lirc.scm \
+ gnu/packages/lisp.scm \
+ gnu/packages/llvm.scm \
+ gnu/packages/lout.scm \
+ gnu/packages/lsh.scm \
+ gnu/packages/lsof.scm \
+ gnu/packages/lua.scm \
+ gnu/packages/lxde.scm \
+ gnu/packages/lxqt.scm \
+ gnu/packages/lynx.scm \
+ gnu/packages/m4.scm \
+ gnu/packages/machine-learning.scm \
+ gnu/packages/man.scm \
+ gnu/packages/mail.scm \
+ gnu/packages/make-bootstrap.scm \
+ gnu/packages/markdown.scm \
+ gnu/packages/mate.scm \
+ gnu/packages/maths.scm \
+ gnu/packages/mc.scm \
+ gnu/packages/mcrypt.scm \
+ gnu/packages/messaging.scm \
+ gnu/packages/mg.scm \
+ gnu/packages/mit-krb5.scm \
+ gnu/packages/moe.scm \
+ gnu/packages/moreutils.scm \
+ gnu/packages/mpd.scm \
+ gnu/packages/mp3.scm \
+ gnu/packages/mpi.scm \
+ gnu/packages/multiprecision.scm \
+ gnu/packages/music.scm \
+ gnu/packages/mtools.scm \
+ gnu/packages/nano.scm \
+ gnu/packages/ncdu.scm \
+ gnu/packages/ncurses.scm \
+ gnu/packages/netpbm.scm \
+ gnu/packages/nettle.scm \
+ gnu/packages/networking.scm \
+ gnu/packages/ninja.scm \
+ gnu/packages/node.scm \
+ gnu/packages/noweb.scm \
+ gnu/packages/ntp.scm \
+ gnu/packages/nutrition.scm \
+ gnu/packages/nvi.scm \
+ gnu/packages/ocaml.scm \
+ gnu/packages/ocr.scm \
+ gnu/packages/onc-rpc.scm \
+ gnu/packages/openbox.scm \
+ gnu/packages/openldap.scm \
+ gnu/packages/openstack.scm \
+ gnu/packages/orpheus.scm \
+ gnu/packages/ots.scm \
+ gnu/packages/owncloud.scm \
+ gnu/packages/package-management.scm \
+ gnu/packages/parallel.scm \
+ gnu/packages/password-utils.scm \
+ gnu/packages/patchutils.scm \
+ gnu/packages/pciutils.scm \
+ gnu/packages/pcre.scm \
+ gnu/packages/pdf.scm \
+ gnu/packages/pem.scm \
+ gnu/packages/perl.scm \
+ gnu/packages/photo.scm \
+ gnu/packages/pkg-config.scm \
+ gnu/packages/plotutils.scm \
+ gnu/packages/polkit.scm \
+ gnu/packages/popt.scm \
+ gnu/packages/pth.scm \
+ gnu/packages/pulseaudio.scm \
+ gnu/packages/pumpio.scm \
+ gnu/packages/pretty-print.scm \
+ gnu/packages/protobuf.scm \
+ gnu/packages/pv.scm \
+ gnu/packages/python.scm \
+ gnu/packages/qemu.scm \
+ gnu/packages/qt.scm \
+ gnu/packages/ragel.scm \
+ gnu/packages/ratpoison.scm \
+ gnu/packages/rc.scm \
+ gnu/packages/rdesktop.scm \
+ gnu/packages/rdf.scm \
+ gnu/packages/readline.scm \
+ gnu/packages/rrdtool.scm \
+ gnu/packages/rsync.scm \
+ gnu/packages/ruby.scm \
+ gnu/packages/rush.scm \
+ gnu/packages/samba.scm \
+ gnu/packages/sawfish.scm \
+ gnu/packages/scanner.scm \
+ gnu/packages/scheme.scm \
+ gnu/packages/screen.scm \
+ gnu/packages/scribus.scm \
+ gnu/packages/sdl.scm \
+ gnu/packages/search.scm \
+ gnu/packages/serialization.scm \
+ gnu/packages/serveez.scm \
+ gnu/packages/shishi.scm \
+ gnu/packages/skarnet.scm \
+ gnu/packages/skribilo.scm \
+ gnu/packages/slang.scm \
+ gnu/packages/slim.scm \
+ gnu/packages/smalltalk.scm \
+ gnu/packages/ssh.scm \
+ gnu/packages/stalonetray.scm \
+ gnu/packages/statistics.scm \
+ gnu/packages/suckless.scm \
+ gnu/packages/swig.scm \
+ gnu/packages/sxiv.scm \
+ gnu/packages/synergy.scm \
+ gnu/packages/task-management.scm \
+ gnu/packages/tbb.scm \
+ gnu/packages/tcl.scm \
+ gnu/packages/tcsh.scm \
+ gnu/packages/telephony.scm \
+ gnu/packages/terminals.scm \
+ gnu/packages/texinfo.scm \
+ gnu/packages/texlive.scm \
+ gnu/packages/textutils.scm \
+ gnu/packages/time.scm \
+ gnu/packages/tls.scm \
+ gnu/packages/tmux.scm \
+ gnu/packages/tor.scm \
+ gnu/packages/tre.scm \
+ gnu/packages/tv.scm \
+ gnu/packages/unrtf.scm \
+ gnu/packages/upnp.scm \
+ gnu/packages/uucp.scm \
+ gnu/packages/valgrind.scm \
+ gnu/packages/version-control.scm \
+ gnu/packages/video.scm \
+ gnu/packages/vim.scm \
+ gnu/packages/vpn.scm \
+ gnu/packages/vtk.scm \
+ gnu/packages/w3m.scm \
+ gnu/packages/wdiff.scm \
+ gnu/packages/web.scm \
+ gnu/packages/webkit.scm \
+ gnu/packages/wget.scm \
+ gnu/packages/wicd.scm \
+ gnu/packages/wine.scm \
+ gnu/packages/wm.scm \
+ gnu/packages/wordnet.scm \
+ gnu/packages/wv.scm \
+ gnu/packages/wxwidgets.scm \
+ gnu/packages/xfig.scm \
+ gnu/packages/xiph.scm \
+ gnu/packages/xml.scm \
+ gnu/packages/xnee.scm \
+ gnu/packages/xdisorg.scm \
+ gnu/packages/xorg.scm \
+ gnu/packages/xfce.scm \
+ gnu/packages/yasm.scm \
+ gnu/packages/yubico.scm \
+ gnu/packages/zile.scm \
+ gnu/packages/zip.scm \
+ gnu/packages/zsh.scm \
+ \
+ gnu/services.scm \
+ gnu/services/avahi.scm \
+ gnu/services/base.scm \
+ gnu/services/databases.scm \
+ gnu/services/dbus.scm \
+ gnu/services/desktop.scm \
+ gnu/services/lirc.scm \
+ gnu/services/mail.scm \
+ gnu/services/networking.scm \
+ gnu/services/shepherd.scm \
+ gnu/services/herd.scm \
+ gnu/services/ssh.scm \
+ gnu/services/web.scm \
+ gnu/services/xorg.scm \
+ \
+ gnu/system.scm \
+ gnu/system/file-systems.scm \
+ gnu/system/grub.scm \
+ gnu/system/install.scm \
+ gnu/system/linux-container.scm \
+ gnu/system/linux-initrd.scm \
+ gnu/system/locale.scm \
+ gnu/system/nss.scm \
+ gnu/system/pam.scm \
+ gnu/system/shadow.scm \
+ gnu/system/vm.scm \
+ \
+ gnu/build/activation.scm \
+ gnu/build/file-systems.scm \
+ gnu/build/install.scm \
+ gnu/build/linux-boot.scm \
+ gnu/build/linux-container.scm \
+ gnu/build/linux-initrd.scm \
+ gnu/build/linux-modules.scm \
+ gnu/build/vm.scm
+
+
+patchdir = $(guilemoduledir)/gnu/packages/patches
+dist_patch_DATA = \
+ gnu/packages/patches/abiword-explictly-cast-bools.patch \
+ gnu/packages/patches/abiword-link-plugins-against-backend.patch \
+ gnu/packages/patches/abiword-no-include-glib-internal-headers.patch \
+ gnu/packages/patches/abiword-pass-no-undefined-to-linker.patch \
+ gnu/packages/patches/abiword-use-proper-png-api.patch \
+ gnu/packages/patches/abiword-wmf-version-lookup-fix.patch \
+ gnu/packages/patches/acl-hurd-path-max.patch \
+ gnu/packages/patches/aegis-constness-error.patch \
+ gnu/packages/patches/aegis-perl-tempdir1.patch \
+ gnu/packages/patches/aegis-perl-tempdir2.patch \
+ gnu/packages/patches/aegis-test-fixup-1.patch \
+ gnu/packages/patches/aegis-test-fixup-2.patch \
+ gnu/packages/patches/agg-am_c_prototype.patch \
+ gnu/packages/patches/alsa-lib-mips-atomic-fix.patch \
+ gnu/packages/patches/apr-skip-getservbyname-test.patch \
+ gnu/packages/patches/arb-ldconfig.patch \
+ gnu/packages/patches/asymptote-gsl2.patch \
+ gnu/packages/patches/ath9k-htc-firmware-binutils.patch \
+ gnu/packages/patches/ath9k-htc-firmware-gcc.patch \
+ gnu/packages/patches/ath9k-htc-firmware-objcopy.patch \
+ gnu/packages/patches/audacity-fix-ffmpeg-binding.patch \
+ gnu/packages/patches/automake-skip-amhello-tests.patch \
+ gnu/packages/patches/automake-regexp-syntax.patch \
+ gnu/packages/patches/avahi-localstatedir.patch \
+ gnu/packages/patches/avidemux-install-to-lib.patch \
+ gnu/packages/patches/avrdude-fix-libusb.patch \
+ gnu/packages/patches/bash-completion-directories.patch \
+ gnu/packages/patches/bigloo-gc-shebangs.patch \
+ gnu/packages/patches/binutils-ld-new-dtags.patch \
+ gnu/packages/patches/binutils-loongson-workaround.patch \
+ gnu/packages/patches/byobu-writable-status.patch \
+ gnu/packages/patches/calibre-drop-unrar.patch \
+ gnu/packages/patches/calibre-no-updates-dialog.patch \
+ gnu/packages/patches/cdparanoia-fpic.patch \
+ gnu/packages/patches/chmlib-inttypes.patch \
+ gnu/packages/patches/clang-libc-search-path.patch \
+ gnu/packages/patches/clucene-pkgconfig.patch \
+ gnu/packages/patches/cmake-fix-tests.patch \
+ gnu/packages/patches/cpio-gets-undeclared.patch \
+ gnu/packages/patches/cpio-CVE-2016-2037.patch \
+ gnu/packages/patches/cpufrequtils-fix-aclocal.patch \
+ gnu/packages/patches/crda-optional-gcrypt.patch \
+ gnu/packages/patches/crossmap-allow-system-pysam.patch \
+ gnu/packages/patches/csound-header-ordering.patch \
+ gnu/packages/patches/cssc-gets-undeclared.patch \
+ gnu/packages/patches/cssc-missing-include.patch \
+ gnu/packages/patches/clucene-contribs-lib.patch \
+ gnu/packages/patches/cursynth-wave-rand.patch \
+ gnu/packages/patches/dbus-helper-search-path.patch \
+ gnu/packages/patches/dealii-p4est-interface.patch \
+ gnu/packages/patches/devil-fix-libpng.patch \
+ gnu/packages/patches/dico-libtool-deterministic.patch \
+ gnu/packages/patches/diffutils-gets-undeclared.patch \
+ gnu/packages/patches/dfu-programmer-fix-libusb.patch \
+ gnu/packages/patches/doxygen-test.patch \
+ gnu/packages/patches/duplicity-piped-password.patch \
+ gnu/packages/patches/duplicity-test_selection-tmp.patch \
+ gnu/packages/patches/elfutils-tests-ptrace.patch \
+ gnu/packages/patches/einstein-build.patch \
+ gnu/packages/patches/emacs-constants-lisp-like.patch \
+ gnu/packages/patches/emacs-exec-path.patch \
+ gnu/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \
+ gnu/packages/patches/emacs-source-date-epoch.patch \
+ gnu/packages/patches/eudev-rules-directory.patch \
+ gnu/packages/patches/evilwm-lost-focus-bug.patch \
+ gnu/packages/patches/expat-CVE-2015-1283.patch \
+ gnu/packages/patches/fastcap-mulGlobal.patch \
+ gnu/packages/patches/fastcap-mulSetup.patch \
+ gnu/packages/patches/fasthenry-spAllocate.patch \
+ gnu/packages/patches/fasthenry-spBuild.patch \
+ gnu/packages/patches/fasthenry-spUtils.patch \
+ gnu/packages/patches/fasthenry-spSolve.patch \
+ gnu/packages/patches/fasthenry-spFactor.patch \
+ gnu/packages/patches/findutils-localstatedir.patch \
+ gnu/packages/patches/findutils-test-xargs.patch \
+ gnu/packages/patches/flashrom-use-libftdi1.patch \
+ gnu/packages/patches/flint-ldconfig.patch \
+ gnu/packages/patches/fltk-shared-lib-defines.patch \
+ gnu/packages/patches/freeimage-CVE-2015-0852.patch \
+ gnu/packages/patches/gawk-fts-test.patch \
+ gnu/packages/patches/gawk-shell.patch \
+ gnu/packages/patches/gcc-arm-link-spec-fix.patch \
+ gnu/packages/patches/gcc-cross-environment-variables.patch \
+ gnu/packages/patches/gcc-libvtv-runpath.patch \
+ gnu/packages/patches/gcc-5.0-libvtv-runpath.patch \
+ gnu/packages/patches/geoclue-config.patch \
+ gnu/packages/patches/ghostscript-CVE-2015-3228.patch \
+ gnu/packages/patches/ghostscript-runpath.patch \
+ gnu/packages/patches/glib-networking-ssl-cert-file.patch \
+ gnu/packages/patches/glib-tests-desktop.patch \
+ gnu/packages/patches/glib-tests-homedir.patch \
+ gnu/packages/patches/glib-tests-prlimit.patch \
+ gnu/packages/patches/glib-tests-timer.patch \
+ gnu/packages/patches/glib-tests-gapplication.patch \
+ gnu/packages/patches/glibc-CVE-2015-7547.patch \
+ gnu/packages/patches/glibc-bootstrap-system.patch \
+ gnu/packages/patches/glibc-hurd-extern-inline.patch \
+ gnu/packages/patches/glibc-ldd-x86_64.patch \
+ gnu/packages/patches/glibc-locales.patch \
+ gnu/packages/patches/glibc-locale-incompatibility.patch \
+ gnu/packages/patches/glibc-o-largefile.patch \
+ gnu/packages/patches/glibc-versioned-locpath.patch \
+ gnu/packages/patches/gmp-arm-asm-nothumb.patch \
+ gnu/packages/patches/gmp-faulty-test.patch \
+ gnu/packages/patches/gnucash-price-quotes-perl.patch \
+ gnu/packages/patches/gnupg-simple-query-ignore-status-messages.patch \
+ gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch \
+ gnu/packages/patches/gobject-introspection-cc.patch \
+ gnu/packages/patches/gobject-introspection-girepository.patch \
+ gnu/packages/patches/grep-timing-sensitive-test.patch \
+ gnu/packages/patches/grub-CVE-2015-8370.patch \
+ gnu/packages/patches/grub-gets-undeclared.patch \
+ gnu/packages/patches/grub-freetype.patch \
+ gnu/packages/patches/guile-1.8-cpp-4.5.patch \
+ gnu/packages/patches/guile-arm-fixes.patch \
+ gnu/packages/patches/guile-default-utf8.patch \
+ gnu/packages/patches/guile-linux-syscalls.patch \
+ gnu/packages/patches/guile-present-coding.patch \
+ gnu/packages/patches/guile-relocatable.patch \
+ gnu/packages/patches/guile-rsvg-pkgconfig.patch \
+ gnu/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
+ gnu/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \
+ gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
+ gnu/packages/patches/hop-bigloo-4.0b.patch \
+ gnu/packages/patches/hop-linker-flags.patch \
+ gnu/packages/patches/hydra-automake-1.15.patch \
+ gnu/packages/patches/hydra-disable-darcs-test.patch \
+ gnu/packages/patches/icecat-avoid-bundled-includes.patch \
+ gnu/packages/patches/icecat-update-graphite2.patch \
+ gnu/packages/patches/icecat-update-graphite2-pt2.patch \
+ gnu/packages/patches/icecat-re-enable-DHE-cipher-suites.patch \
+ gnu/packages/patches/icecat-CVE-2015-4477.patch \
+ gnu/packages/patches/icecat-CVE-2015-7207.patch \
+ gnu/packages/patches/icecat-CVE-2016-1952-pt01.patch \
+ gnu/packages/patches/icecat-CVE-2016-1952-pt02.patch \
+ gnu/packages/patches/icecat-CVE-2016-1952-pt03.patch \
+ gnu/packages/patches/icecat-CVE-2016-1952-pt04.patch \
+ gnu/packages/patches/icecat-CVE-2016-1952-pt05.patch \
+ gnu/packages/patches/icecat-CVE-2016-1952-pt06.patch \
+ gnu/packages/patches/icecat-CVE-2016-1954.patch \
+ gnu/packages/patches/icecat-CVE-2016-1960.patch \
+ gnu/packages/patches/icecat-CVE-2016-1961.patch \
+ gnu/packages/patches/icecat-CVE-2016-1962.patch \
+ gnu/packages/patches/icecat-CVE-2016-1964.patch \
+ gnu/packages/patches/icecat-CVE-2016-1965.patch \
+ gnu/packages/patches/icecat-CVE-2016-1966.patch \
+ gnu/packages/patches/icecat-CVE-2016-1974.patch \
+ gnu/packages/patches/icecat-bug-1248851.patch \
+ gnu/packages/patches/icu4c-CVE-2014-6585.patch \
+ gnu/packages/patches/icu4c-CVE-2015-1270.patch \
+ gnu/packages/patches/icu4c-CVE-2015-4760.patch \
+ gnu/packages/patches/ilmbase-fix-tests.patch \
+ gnu/packages/patches/imagemagick-test-segv.patch \
+ gnu/packages/patches/irrlicht-mesa-10.patch \
+ gnu/packages/patches/jasper-CVE-2007-2721.patch \
+ gnu/packages/patches/jasper-CVE-2008-3520.patch \
+ gnu/packages/patches/jasper-CVE-2008-3522.patch \
+ gnu/packages/patches/jasper-CVE-2011-4516-and-CVE-2011-4517.patch \
+ gnu/packages/patches/jasper-CVE-2014-8137.patch \
+ gnu/packages/patches/jasper-CVE-2014-8138.patch \
+ gnu/packages/patches/jasper-CVE-2014-8157.patch \
+ gnu/packages/patches/jasper-CVE-2014-8158.patch \
+ gnu/packages/patches/jasper-CVE-2014-9029.patch \
+ gnu/packages/patches/jasper-CVE-2016-1577.patch \
+ gnu/packages/patches/jasper-CVE-2016-1867.patch \
+ gnu/packages/patches/jasper-CVE-2016-2089.patch \
+ gnu/packages/patches/jasper-CVE-2016-2116.patch \
+ gnu/packages/patches/jbig2dec-ignore-testtest.patch \
+ gnu/packages/patches/kmod-module-directory.patch \
+ gnu/packages/patches/ldc-disable-tests.patch \
+ gnu/packages/patches/lftp-dont-save-unknown-host-fingerprint.patch \
+ gnu/packages/patches/liba52-enable-pic.patch \
+ gnu/packages/patches/liba52-link-with-libm.patch \
+ gnu/packages/patches/liba52-set-soname.patch \
+ gnu/packages/patches/liba52-use-mtune-not-mcpu.patch \
+ gnu/packages/patches/libarchive-bsdtar-test.patch \
+ gnu/packages/patches/libarchive-CVE-2013-0211.patch \
+ gnu/packages/patches/libarchive-fix-lzo-test-case.patch \
+ gnu/packages/patches/libarchive-mtree-filename-length-fix.patch \
+ gnu/packages/patches/libbonobo-activation-test-race.patch \
+ gnu/packages/patches/libcanberra-sound-theme-freedesktop.patch \
+ gnu/packages/patches/libcmis-fix-test-onedrive.patch \
+ gnu/packages/patches/libdrm-symbol-check.patch \
+ gnu/packages/patches/libevent-dns-tests.patch \
+ gnu/packages/patches/libmtp-devices.patch \
+ gnu/packages/patches/liboop-mips64-deplibs-fix.patch \
+ gnu/packages/patches/libotr-test-auth-fix.patch \
+ gnu/packages/patches/liblxqt-include.patch \
+ gnu/packages/patches/libmad-armv7-thumb-pt1.patch \
+ gnu/packages/patches/libmad-armv7-thumb-pt2.patch \
+ gnu/packages/patches/libmad-frame-length.patch \
+ gnu/packages/patches/libmad-mips-newgcc.patch \
+ gnu/packages/patches/libssh-0.6.5-CVE-2016-0739.patch \
+ gnu/packages/patches/libtheora-config-guess.patch \
+ gnu/packages/patches/libtiff-CVE-2015-8665+CVE-2015-8683.patch \
+ gnu/packages/patches/libtiff-oob-accesses-in-decode.patch \
+ gnu/packages/patches/libtiff-oob-write-in-nextdecode.patch \
+ gnu/packages/patches/libtool-skip-tests2.patch \
+ gnu/packages/patches/libunwind-CVE-2015-3239.patch \
+ gnu/packages/patches/libwmf-CAN-2004-0941.patch \
+ gnu/packages/patches/libwmf-CVE-2006-3376.patch \
+ gnu/packages/patches/libwmf-CVE-2007-0455.patch \
+ gnu/packages/patches/libwmf-CVE-2007-2756.patch \
+ gnu/packages/patches/libwmf-CVE-2007-3472.patch \
+ gnu/packages/patches/libwmf-CVE-2007-3473.patch \
+ gnu/packages/patches/libwmf-CVE-2007-3477.patch \
+ gnu/packages/patches/libwmf-CVE-2009-1364.patch \
+ gnu/packages/patches/libwmf-CVE-2009-3546.patch \
+ gnu/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch \
+ gnu/packages/patches/libwmf-CVE-2015-4695.patch \
+ gnu/packages/patches/libwmf-CVE-2015-4696.patch \
+ gnu/packages/patches/libxslt-CVE-2015-7995.patch \
+ gnu/packages/patches/lirc-localstatedir.patch \
+ gnu/packages/patches/libpthread-glibc-preparation.patch \
+ gnu/packages/patches/lm-sensors-hwmon-attrs.patch \
+ gnu/packages/patches/lua-pkgconfig.patch \
+ gnu/packages/patches/lua51-liblua-so.patch \
+ gnu/packages/patches/lua52-liblua-so.patch \
+ gnu/packages/patches/luajit-no_ldconfig.patch \
+ gnu/packages/patches/luajit-symlinks.patch \
+ gnu/packages/patches/luit-posix.patch \
+ gnu/packages/patches/m4-gets-undeclared.patch \
+ gnu/packages/patches/make-impure-dirs.patch \
+ gnu/packages/patches/mars-install.patch \
+ gnu/packages/patches/mars-sfml-2.3.patch \
+ gnu/packages/patches/matplotlib-setupext-tk.patch \
+ gnu/packages/patches/maxima-defsystem-mkdir.patch \
+ gnu/packages/patches/mcron-install.patch \
+ gnu/packages/patches/mdadm-gcc-4.9-fix.patch \
+ gnu/packages/patches/mhash-keygen-test-segfault.patch \
+ gnu/packages/patches/mit-krb5-CVE-2015-8629.patch \
+ gnu/packages/patches/mit-krb5-CVE-2015-8630.patch \
+ gnu/packages/patches/mit-krb5-CVE-2015-8631.patch \
+ gnu/packages/patches/mit-krb5-init-context-null-spnego.patch \
+ gnu/packages/patches/mpc123-initialize-ao.patch \
+ gnu/packages/patches/mplayer2-theora-fix.patch \
+ gnu/packages/patches/module-init-tools-moduledir.patch \
+ gnu/packages/patches/mumps-build-parallelism.patch \
+ gnu/packages/patches/mupen64plus-ui-console-notice.patch \
+ gnu/packages/patches/mutt-store-references.patch \
+ gnu/packages/patches/net-tools-bitrot.patch \
+ gnu/packages/patches/ngircd-handle-zombies.patch \
+ gnu/packages/patches/ngircd-no-dns-in-tests.patch \
+ gnu/packages/patches/ninja-tests.patch \
+ gnu/packages/patches/ninja-zero-mtime.patch \
+ gnu/packages/patches/nss-pkgconfig.patch \
+ gnu/packages/patches/nvi-assume-preserve-path.patch \
+ gnu/packages/patches/nvi-dbpagesize-binpower.patch \
+ gnu/packages/patches/nvi-db4.patch \
+ gnu/packages/patches/ocaml-findlib-make-install.patch \
+ gnu/packages/patches/openexr-missing-samples.patch \
+ gnu/packages/patches/openimageio-boost-1.60.patch \
+ gnu/packages/patches/openjpeg-CVE-2015-6581.patch \
+ gnu/packages/patches/openjpeg-use-after-free-fix.patch \
+ gnu/packages/patches/openssl-runpath.patch \
+ gnu/packages/patches/openssl-c-rehash-in.patch \
+ gnu/packages/patches/orpheus-cast-errors-and-includes.patch \
+ gnu/packages/patches/ots-no-include-missing-file.patch \
+ gnu/packages/patches/patchelf-page-size.patch \
+ gnu/packages/patches/patchelf-rework-for-arm.patch \
+ gnu/packages/patches/patchutils-xfail-gendiff-tests.patch \
+ gnu/packages/patches/patch-hurd-path-max.patch \
+ gnu/packages/patches/perl-CVE-2015-8607.patch \
+ gnu/packages/patches/perl-CVE-2016-2381.patch \
+ gnu/packages/patches/perl-autosplit-default-time.patch \
+ gnu/packages/patches/perl-deterministic-ordering.patch \
+ gnu/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
+ gnu/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch \
+ gnu/packages/patches/perl-io-socket-ssl-openssl-1.0.2f-fix.patch \
+ gnu/packages/patches/perl-net-amazon-s3-moose-warning.patch \
+ gnu/packages/patches/perl-net-ssleay-disable-ede-test.patch \
+ gnu/packages/patches/perl-no-build-time.patch \
+ gnu/packages/patches/perl-no-sys-dirs.patch \
+ gnu/packages/patches/perl-module-pluggable-search.patch \
+ gnu/packages/patches/perl-source-date-epoch.patch \
+ gnu/packages/patches/pidgin-add-search-path.patch \
+ gnu/packages/patches/pinball-const-fix.patch \
+ gnu/packages/patches/pinball-cstddef.patch \
+ gnu/packages/patches/pinball-missing-separators.patch \
+ gnu/packages/patches/pinball-src-deps.patch \
+ gnu/packages/patches/pinball-system-ltdl.patch \
+ gnu/packages/patches/pingus-sdl-libs-config.patch \
+ gnu/packages/patches/plink-1.07-unclobber-i.patch \
+ gnu/packages/patches/plotutils-libpng-jmpbuf.patch \
+ gnu/packages/patches/polkit-drop-test.patch \
+ gnu/packages/patches/portaudio-audacity-compat.patch \
+ gnu/packages/patches/procmail-ambiguous-getline-debian.patch \
+ gnu/packages/patches/pt-scotch-build-parallelism.patch \
+ gnu/packages/patches/pulseaudio-fix-mult-test.patch \
+ gnu/packages/patches/pulseaudio-longer-test-timeout.patch \
+ gnu/packages/patches/pycairo-wscript.patch \
+ gnu/packages/patches/pybugz-encode-error.patch \
+ gnu/packages/patches/pybugz-stty.patch \
+ gnu/packages/patches/pygpgme-disable-problematic-tests.patch \
+ gnu/packages/patches/pyqt-configure.patch \
+ gnu/packages/patches/python-2-deterministic-build-info.patch \
+ gnu/packages/patches/python-2.7-search-paths.patch \
+ gnu/packages/patches/python-2.7-source-date-epoch.patch \
+ gnu/packages/patches/python-3-deterministic-build-info.patch \
+ gnu/packages/patches/python-3-search-paths.patch \
+ gnu/packages/patches/python-disable-ssl-test.patch \
+ gnu/packages/patches/python-fix-tests.patch \
+ gnu/packages/patches/python-ipython-inputhook-ctype.patch \
+ gnu/packages/patches/python-rarfile-fix-tests.patch \
+ gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
+ gnu/packages/patches/python-configobj-setuptools.patch \
+ gnu/packages/patches/python-paste-remove-website-test.patch \
+ gnu/packages/patches/python-paste-remove-timing-test.patch \
+ gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
+ gnu/packages/patches/qemu-CVE-2015-8558.patch \
+ gnu/packages/patches/qemu-CVE-2015-8567.patch \
+ gnu/packages/patches/qemu-CVE-2015-8613.patch \
+ gnu/packages/patches/qemu-CVE-2015-8619.patch \
+ gnu/packages/patches/qemu-CVE-2015-8701.patch \
+ gnu/packages/patches/qemu-CVE-2015-8743.patch \
+ gnu/packages/patches/qemu-CVE-2016-1568.patch \
+ gnu/packages/patches/qemu-CVE-2016-1922.patch \
+ gnu/packages/patches/qemu-CVE-2016-1981.patch \
+ gnu/packages/patches/qemu-CVE-2016-2197.patch \
+ gnu/packages/patches/qemu-usb-ehci-oob-read.patch \
+ gnu/packages/patches/qemu-virtio-9p-use-accessor-to-get-thread-pool.patch \
+ gnu/packages/patches/qt4-ldflags.patch \
+ gnu/packages/patches/ratpoison-shell.patch \
+ gnu/packages/patches/readline-link-ncurses.patch \
+ gnu/packages/patches/ripperx-missing-file.patch \
+ gnu/packages/patches/rsem-makefile.patch \
+ gnu/packages/patches/sed-hurd-path-max.patch \
+ gnu/packages/patches/scheme48-tests.patch \
+ gnu/packages/patches/scotch-test-threading.patch \
+ gnu/packages/patches/sdl-libx11-1.6.patch \
+ gnu/packages/patches/serf-comment-style-fix.patch \
+ gnu/packages/patches/serf-deflate-buckets-test-fix.patch \
+ gnu/packages/patches/slim-session.patch \
+ gnu/packages/patches/slim-config.patch \
+ gnu/packages/patches/slim-sigusr1.patch \
+ gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch \
+ gnu/packages/patches/soprano-find-clucene.patch \
+ gnu/packages/patches/sudo-CVE-2015-5602.patch \
+ gnu/packages/patches/superlu-dist-scotchmetis.patch \
+ gnu/packages/patches/synfig-build-fix.patch \
+ gnu/packages/patches/tar-d_ino_in_dirent-fix.patch \
+ gnu/packages/patches/tar-skip-unreliable-tests.patch \
+ gnu/packages/patches/tcl-mkindex-deterministic.patch \
+ gnu/packages/patches/tclxml-3.2-install.patch \
+ gnu/packages/patches/tcsh-fix-autotest.patch \
+ gnu/packages/patches/texi2html-document-encoding.patch \
+ gnu/packages/patches/texi2html-i18n.patch \
+ gnu/packages/patches/tidy-CVE-2015-5522+5523.patch \
+ gnu/packages/patches/tinyxml-use-stl.patch \
+ gnu/packages/patches/tk-find-library.patch \
+ gnu/packages/patches/tophat-build-with-later-seqan.patch \
+ gnu/packages/patches/torsocks-dns-test.patch \
+ gnu/packages/patches/tvtime-gcc41.patch \
+ gnu/packages/patches/tvtime-pngoutput.patch \
+ gnu/packages/patches/tvtime-videodev2.patch \
+ gnu/packages/patches/tvtime-xmltv.patch \
+ gnu/packages/patches/unzip-CVE-2014-8139.patch \
+ gnu/packages/patches/unzip-CVE-2014-8140.patch \
+ gnu/packages/patches/unzip-CVE-2014-8141.patch \
+ gnu/packages/patches/unzip-CVE-2014-9636.patch \
+ gnu/packages/patches/unzip-CVE-2015-7696.patch \
+ gnu/packages/patches/unzip-CVE-2015-7697.patch \
+ gnu/packages/patches/unzip-allow-greater-hostver-values.patch \
+ gnu/packages/patches/unzip-attribs-overflow.patch \
+ gnu/packages/patches/unzip-overflow-on-invalid-input.patch \
+ gnu/packages/patches/unzip-format-secure.patch \
+ gnu/packages/patches/unzip-initialize-symlink-flag.patch \
+ gnu/packages/patches/unzip-overflow-long-fsize.patch \
+ gnu/packages/patches/unzip-remove-build-date.patch \
+ gnu/packages/patches/util-linux-tests.patch \
+ gnu/packages/patches/upower-builddir.patch \
+ gnu/packages/patches/valgrind-enable-arm.patch \
+ gnu/packages/patches/vorbis-tools-CVE-2015-6749.patch \
+ gnu/packages/patches/vpnc-script.patch \
+ gnu/packages/patches/vtk-mesa-10.patch \
+ gnu/packages/patches/w3m-libgc.patch \
+ gnu/packages/patches/w3m-force-ssl_verify_server-on.patch \
+ gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch \
+ gnu/packages/patches/w3m-disable-weak-ciphers.patch \
+ gnu/packages/patches/weechat-python.patch \
+ gnu/packages/patches/weex-vacopy.patch \
+ gnu/packages/patches/wicd-bitrate-none-fix.patch \
+ gnu/packages/patches/wicd-get-selected-profile-fix.patch \
+ gnu/packages/patches/wicd-urwid-1.3.patch \
+ gnu/packages/patches/wicd-wpa2-ttls.patch \
+ gnu/packages/patches/wmctrl-64-fix.patch \
+ gnu/packages/patches/wpa-supplicant-CVE-2015-5310.patch \
+ gnu/packages/patches/wpa-supplicant-CVE-2015-5314.patch \
+ gnu/packages/patches/wpa-supplicant-CVE-2015-5315.patch \
+ gnu/packages/patches/wpa-supplicant-CVE-2015-5316.patch \
+ gnu/packages/patches/xdotool-fix-makefile.patch \
+ gnu/packages/patches/xf86-video-ark-remove-mibstore.patch \
+ gnu/packages/patches/xf86-video-ast-remove-mibstore.patch \
+ gnu/packages/patches/xf86-video-geode-glibc-2.20.patch \
+ gnu/packages/patches/xf86-video-glint-remove-mibstore.patch \
+ gnu/packages/patches/xf86-video-i128-remove-mibstore.patch \
+ gnu/packages/patches/xf86-video-intel-compat-api.patch \
+ gnu/packages/patches/xf86-video-intel-glibc-2.20.patch \
+ gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch \
+ gnu/packages/patches/xf86-video-nv-remove-mibstore.patch \
+ gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch \
+ gnu/packages/patches/xf86-video-tga-remove-mibstore.patch \
+ gnu/packages/patches/xfce4-panel-plugins.patch \
+ gnu/packages/patches/xfce4-session-fix-xflock4.patch \
+ gnu/packages/patches/xfce4-settings-defaults.patch \
+ gnu/packages/patches/xmodmap-asprintf.patch \
+ gnu/packages/patches/zathura-plugindir-environment-variable.patch
+
+MISC_DISTRO_FILES = \
+ gnu/packages/ld-wrapper.in
+
+bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
+bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux
+bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux
+bootstrap_armhf_linuxdir = $(bootstrapdir)/armhf-linux
+bootstrap_mips64el_linuxdir = $(bootstrapdir)/mips64el-linux
+
+dist_bootstrap_x86_64_linux_DATA = \
+ gnu/packages/bootstrap/x86_64-linux/bash \
+ gnu/packages/bootstrap/x86_64-linux/mkdir \
+ gnu/packages/bootstrap/x86_64-linux/tar \
+ gnu/packages/bootstrap/x86_64-linux/xz
+
+dist_bootstrap_i686_linux_DATA = \
+ gnu/packages/bootstrap/i686-linux/bash \
+ gnu/packages/bootstrap/i686-linux/mkdir \
+ gnu/packages/bootstrap/i686-linux/tar \
+ gnu/packages/bootstrap/i686-linux/xz
+
+dist_bootstrap_armhf_linux_DATA = \
+ gnu/packages/bootstrap/armhf-linux/bash \
+ gnu/packages/bootstrap/armhf-linux/mkdir \
+ gnu/packages/bootstrap/armhf-linux/tar \
+ gnu/packages/bootstrap/armhf-linux/xz
+
+dist_bootstrap_mips64el_linux_DATA = \
+ gnu/packages/bootstrap/mips64el-linux/bash \
+ gnu/packages/bootstrap/mips64el-linux/mkdir \
+ gnu/packages/bootstrap/mips64el-linux/tar \
+ gnu/packages/bootstrap/mips64el-linux/xz
+
+# Big bootstrap binaries are not included in the tarball. Instead, they
+# are downloaded.
+nodist_bootstrap_x86_64_linux_DATA = \
+ gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz
+nodist_bootstrap_i686_linux_DATA = \
+ gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz
+nodist_bootstrap_armhf_linux_DATA = \
+ gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz
+nodist_bootstrap_mips64el_linux_DATA = \
+ gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz
+
+# Those files must remain executable, so they remain executable once
+# imported into the store.
+set-bootstrap-executable-permissions:
+ chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz}
+
+DISTCLEANFILES = \
+ $(nodist_bootstrap_x86_64_linux_DATA) \
+ $(nodist_bootstrap_i686_linux_DATA) \
+ $(nodist_bootstrap_armhf_linux_DATA) \
+ $(nodist_bootstrap_mips64el_linux_DATA)
+
+# Method to download a file from an external source.
+DOWNLOAD_FILE = \
+ GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH" \
+ $(GUILE) --no-auto-compile -L "$(top_builddir)" -L "$(top_srcdir)" \
+ "$(top_srcdir)/build-aux/download.scm"
+
+gnu/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz:
+ $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
+ $(DOWNLOAD_FILE) "$@" \
+ "037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0"
+gnu/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz:
+ $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
+ $(DOWNLOAD_FILE) "$@" \
+ "b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846"
+gnu/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz:
+ $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
+ $(DOWNLOAD_FILE) "$@" \
+ "e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6"
+gnu/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz:
+ $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \
+ $(DOWNLOAD_FILE) "$@" \
+ "994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b"
diff --git a/guix/config.scm.in b/guix/config.scm.in
index 764e466..d7df9f7 100644
--- a/guix/config.scm.in
+++ b/guix/config.scm.in
@@ -55,11 +55,11 @@
"@storedir@"))
(define %state-directory
- ;; This must match `NIX_STATE_DIR' as defined in `daemon.am'.
+ ;; This must match `NIX_STATE_DIR' as defined in `nix/local.mk'.
(or (getenv "NIX_STATE_DIR") "@guix_localstatedir@/guix"))
(define %config-directory
- ;; This must match `NIX_CONF_DIR' as defined in `daemon.am'.
+ ;; This must match `NIX_CONF_DIR' as defined in `nix/local.mk'.
(or (getenv "NIX_CONF_DIR") "@guix_sysconfdir@/guix"))
(define %guix-register-program
diff --git a/nix/local.mk b/nix/local.mk
new file mode 100644
index 0000000..3c15531
--- /dev/null
+++ b/nix/local.mk
@@ -0,0 +1,226 @@
+# GNU Guix --- Functional package management for GNU
+# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
+#
+# 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/>.
+
+#
+# Integration of the `guix-daemon' code taken from upstream Nix.
+#
+
+BUILT_SOURCES += nix/libstore/schema.sql.hh
+CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service etc/guix-daemon.conf
+
+noinst_LIBRARIES = libformat.a libutil.a libstore.a
+
+# Use '-std=c++11' for 'std::shared_ptr', 'auto', lambdas, and more.
+AM_CXXFLAGS = -Wall -std=c++11
+
+libformat_a_SOURCES = \
+ nix/boost/format/free_funcs.cc \
+ nix/boost/format/parsing.cc \
+ nix/boost/format/format_implementation.cc
+
+libformat_headers = \
+ nix/boost/throw_exception.hpp \
+ nix/boost/format.hpp \
+ nix/boost/assert.hpp \
+ nix/boost/format/macros_default.hpp \
+ nix/boost/format/format_fwd.hpp \
+ nix/boost/format/format_class.hpp \
+ nix/boost/format/exceptions.hpp \
+ nix/boost/format/group.hpp \
+ nix/boost/format/feed_args.hpp \
+ nix/boost/format/internals_fwd.hpp \
+ nix/boost/format/internals.hpp
+
+libformat_a_CPPFLAGS = \
+ -I$(top_srcdir)/nix
+
+libutil_a_SOURCES = \
+ nix/libutil/archive.cc \
+ nix/libutil/affinity.cc \
+ nix/libutil/serialise.cc \
+ nix/libutil/util.cc \
+ nix/libutil/xml-writer.cc \
+ nix/libutil/hash.cc \
+ nix/libutil/gcrypt-hash.cc
+
+libutil_headers = \
+ nix/libutil/affinity.hh \
+ nix/libutil/hash.hh \
+ nix/libutil/serialise.hh \
+ nix/libutil/xml-writer.hh \
+ nix/libutil/util.hh \
+ nix/libutil/archive.hh \
+ nix/libutil/types.hh \
+ nix/libutil/gcrypt-hash.hh \
+ nix/libutil/md5.h \
+ nix/libutil/sha1.h \
+ nix/libutil/sha256.h \
+ nix/libutil/sha512.h
+
+libutil_a_CPPFLAGS = \
+ -I$(top_builddir)/nix \
+ -I$(top_srcdir)/nix/libutil \
+ $(libformat_a_CPPFLAGS)
+
+libstore_a_SOURCES = \
+ nix/libstore/gc.cc \
+ nix/libstore/globals.cc \
+ nix/libstore/misc.cc \
+ nix/libstore/references.cc \
+ nix/libstore/store-api.cc \
+ nix/libstore/optimise-store.cc \
+ nix/libstore/local-store.cc \
+ nix/libstore/build.cc \
+ nix/libstore/pathlocks.cc \
+ nix/libstore/derivations.cc
+
+libstore_headers = \
+ nix/libstore/references.hh \
+ nix/libstore/pathlocks.hh \
+ nix/libstore/globals.hh \
+ nix/libstore/worker-protocol.hh \
+ nix/libstore/derivations.hh \
+ nix/libstore/misc.hh \
+ nix/libstore/local-store.hh \
+ nix/libstore/store-api.hh
+
+libstore_a_CPPFLAGS = \
+ $(libutil_a_CPPFLAGS) \
+ -I$(top_srcdir)/nix/libstore \
+ -I$(top_builddir)/nix/libstore \
+ -DNIX_STORE_DIR=\"$(storedir)\" \
+ -DNIX_DATA_DIR=\"$(datadir)\" \
+ -DNIX_STATE_DIR=\"$(localstatedir)/guix\" \
+ -DNIX_LOG_DIR=\"$(localstatedir)/log/guix\" \
+ -DNIX_CONF_DIR=\"$(sysconfdir)/guix\" \
+ -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \
+ -DNIX_BIN_DIR=\"$(bindir)\" \
+ -DOPENSSL_PATH="\"guix-authenticate\"" \
+ -DDEFAULT_CHROOT_DIRS="\"\""
+
+libstore_a_CXXFLAGS = $(AM_CXXFLAGS) \
+ $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS)
+
+bin_PROGRAMS = guix-daemon
+sbin_PROGRAMS = guix-register
+
+guix_daemon_SOURCES = \
+ nix/nix-daemon/nix-daemon.cc \
+ nix/nix-daemon/guix-daemon.cc
+
+guix_daemon_CPPFLAGS = \
+ -DLOCALEDIR=\"$(localedir)\" \
+ $(libutil_a_CPPFLAGS) \
+ -I$(top_srcdir)/nix/libstore
+
+guix_daemon_LDADD = \
+ libstore.a libutil.a libformat.a -lbz2 \
+ $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS)
+
+guix_daemon_headers = \
+ nix/nix-daemon/shared.hh
+
+
+guix_register_SOURCES = \
+ nix/guix-register/guix-register.cc
+
+guix_register_CPPFLAGS = \
+ $(libutil_a_CPPFLAGS) \
+ $(libstore_a_CPPFLAGS) \
+ -I$(top_srcdir)/nix/libstore
+
+# XXX: Should we start using shared libs?
+guix_register_LDADD = \
+ libstore.a libutil.a libformat.a -lbz2 \
+ $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS)
+
+
+noinst_HEADERS = \
+ $(libformat_headers) $(libutil_headers) $(libstore_headers) \
+ $(guix_daemon_headers)
+
+nix/libstore/schema.sql.hh: nix/libstore/schema.sql
+ $(AM_V_GEN)$(GUILE) --no-auto-compile -c \
+ "(use-modules (rnrs io ports)) \
+ (call-with-output-file \"$@\" \
+ (lambda (out) \
+ (call-with-input-file \"$^\" \
+ (lambda (in) \
+ (write (get-string-all in) out)))))"
+
+nodist_pkglibexec_SCRIPTS = \
+ nix/scripts/list-runtime-roots \
+ nix/scripts/substitute
+
+if BUILD_DAEMON_OFFLOAD
+
+nodist_pkglibexec_SCRIPTS += \
+ nix/scripts/offload
+
+endif BUILD_DAEMON_OFFLOAD
+
+
+# XXX: It'd be better to hide it in $(pkglibexecdir).
+nodist_libexec_SCRIPTS = \
+ nix/scripts/guix-authenticate
+
+# The '.service' file for systemd.
+systemdservicedir = $(libdir)/systemd/system
+nodist_systemdservice_DATA = etc/guix-daemon.service
+
+etc/guix-daemon.service: etc/guix-daemon.service.in \
+ $(top_builddir)/config.status
+ $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \
+ $(SED) -e 's|@''bindir''@|$(bindir)|' < \
+ "$(srcdir)/etc/guix-daemon.service.in" > "$@.tmp"; \
+ mv "$@.tmp" "$@"
+
+# The '.conf' job for Upstart.
+upstartjobdir = $(libdir)/upstart/system
+nodist_upstartjob_DATA = etc/guix-daemon.conf
+
+etc/guix-daemon.conf: etc/guix-daemon.conf.in \
+ $(top_builddir)/config.status
+ $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \
+ $(SED) -e 's|@''bindir''@|$(bindir)|' < \
+ "$(srcdir)/etc/guix-daemon.conf.in" > "$@.tmp"; \
+ mv "$@.tmp" "$@"
+
+EXTRA_DIST += \
+ nix/libstore/schema.sql \
+ nix/AUTHORS \
+ nix/COPYING \
+ etc/guix-daemon.service.in \
+ etc/guix-daemon.conf.in
+
+if CAN_RUN_TESTS
+
+AM_TESTS_ENVIRONMENT += \
+ top_builddir="$(abs_top_builddir)"
+
+TESTS += \
+ tests/guix-daemon.sh
+
+endif CAN_RUN_TESTS
+
+clean-local:
+ -if test -d "$(GUIX_TEST_ROOT)"; then \
+ find "$(GUIX_TEST_ROOT)" | xargs chmod +w; \
+ fi
+ -rm -rf "$(GUIX_TEST_ROOT)"
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/2] build: Move environment scripts to 'build-aux' directory.
2016-04-03 16:18 [PATCH 0/2] Clean repository top-level directory Mathieu Lirzin
2016-04-03 16:18 ` [PATCH 1/2] build: Move included files to subdirectories Mathieu Lirzin
@ 2016-04-03 16:18 ` Mathieu Lirzin
2016-04-03 17:05 ` Alex Kost
2016-04-14 17:48 ` Ludovic Courtès
1 sibling, 2 replies; 15+ messages in thread
From: Mathieu Lirzin @ 2016-04-03 16:18 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 729 bytes --]
* pre-inst-env.in: Move to ...
* build-aux/pre-inst-env.in: ... here.
* test-env.in: Move to ...
* build-aux/test-env.in: ... here.
* configure.ac (AC_CONFIG_FILES): Adapt to this.
---
build-aux/pre-inst-env.in | 71 +++++++++++++++++++++++++
build-aux/test-env.in | 131 ++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 5 +-
pre-inst-env.in | 71 -------------------------
test-env.in | 131 ----------------------------------------------
5 files changed, 205 insertions(+), 204 deletions(-)
create mode 100644 build-aux/pre-inst-env.in
create mode 100644 build-aux/test-env.in
delete mode 100644 pre-inst-env.in
delete mode 100644 test-env.in
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-build-Move-environment-scripts-to-build-aux-director.patch --]
[-- Type: text/x-patch; name="0002-build-Move-environment-scripts-to-build-aux-director.patch", Size: 16676 bytes --]
diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in
new file mode 100644
index 0000000..fe56da6
--- /dev/null
+++ b/build-aux/pre-inst-env.in
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+# GNU Guix --- Functional package management for GNU
+# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+#
+# 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/>.
+
+# Usage: ./pre-inst-env COMMAND ARG...
+#
+# Run COMMAND in a pre-installation environment. Typical use is
+# "./pre-inst-env guix build hello".
+
+# By default we may end up with absolute directory names that contain '..',
+# which get into $GUILE_LOAD_PATH, leading to '..' in the module file names
+# recorded by Guile. To avoid that, make sure we get a real absolute
+# directory name. Additionally, use '-P' to get the canonical directory name
+# so that Guile's 'relative' %file-port-name-canonicalization can actually
+# work (see <http://bugs.gnu.org/17935>.)
+abs_top_srcdir="`cd "@abs_top_srcdir@" > /dev/null; pwd -P`"
+abs_top_builddir="`cd "@abs_top_builddir@" > /dev/null; pwd -P`"
+
+GUILE_LOAD_COMPILED_PATH="$abs_top_builddir${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH"
+GUILE_LOAD_PATH="$abs_top_builddir:$abs_top_srcdir${GUILE_LOAD_PATH:+:}$GUILE_LOAD_PATH"
+export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH
+
+# Define $PATH so that `guix' and friends are easily found.
+
+PATH="$abs_top_builddir/scripts:$abs_top_builddir:$PATH"
+export PATH
+
+# Daemon helpers.
+
+NIX_ROOT_FINDER="$abs_top_builddir/nix/scripts/list-runtime-roots"
+NIX_SUBSTITUTERS="$abs_top_builddir/nix/scripts/substitute"
+NIX_BUILD_HOOK="$abs_top_builddir/nix/scripts/offload"
+NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" # for 'guix-authenticate'
+
+export NIX_ROOT_FINDER NIX_SUBSTITUTERS \
+ NIX_BUILD_HOOK NIX_LIBEXEC_DIR
+
+# The 'guix-register' program.
+GUIX_REGISTER="$abs_top_builddir/guix-register"
+export GUIX_REGISTER
+
+# The following variables need only be defined when compiling Guix
+# modules, but we define them to be on the safe side in case of
+# auto-compilation.
+
+NIX_HASH="@NIX_HASH@"
+export NIX_HASH
+
+# Define $GUIX_UNINSTALLED to prevent `guix' from
+# prepending @guilemoduledir@ to the Guile load paths.
+
+GUIX_UNINSTALLED=1
+export GUIX_UNINSTALLED
+
+exec "$@"
diff --git a/build-aux/test-env.in b/build-aux/test-env.in
new file mode 100644
index 0000000..c3f60f7
--- /dev/null
+++ b/build-aux/test-env.in
@@ -0,0 +1,131 @@
+#!/bin/sh
+
+# GNU Guix --- Functional package management for GNU
+# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+#
+# 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/>.
+
+# Usage: ./test-env COMMAND ARG...
+#
+# Run the daemon in the build directory, and run COMMAND within
+# `pre-inst-env'. This is used to run unit tests with the just-built
+# daemon, unless `--disable-daemon' was passed at configure time.
+
+
+# Make sure 'cd' behaves deterministically and doesn't write anything to
+# stdout.
+unset CDPATH
+
+if [ -x "@abs_top_builddir@/guix-daemon" ]
+then
+ # Silence the daemon's output, which is often useless, as well as that of
+ # Bash (such as "Terminated" messages when 'guix-daemon' is killed.)
+ exec 2> /dev/null
+
+ NIX_STORE_DIR="@GUIX_TEST_ROOT@/store"
+
+ # Do that because store.scm calls `canonicalize-path' on it.
+ mkdir -p "$NIX_STORE_DIR"
+
+ # Canonicalize the store directory name in an attempt to avoid symlinks in
+ # it or its parent directories. See <http://bugs.gnu.org/17935>.
+ NIX_STORE_DIR="`cd "@GUIX_TEST_ROOT@/store"; pwd -P`"
+
+ NIX_LOCALSTATE_DIR="@GUIX_TEST_ROOT@/var"
+ NIX_LOG_DIR="@GUIX_TEST_ROOT@/var/log/guix"
+ NIX_DB_DIR="@GUIX_TEST_ROOT@/db"
+ NIX_ROOT_FINDER="@abs_top_builddir@/nix/scripts/list-runtime-roots"
+
+ # Choose a PID-dependent name to allow for parallel builds. Note
+ # that the directory name must be chosen so that the socket's file
+ # name is less than 108-char long (the size of `sun_path' in glibc).
+ # Currently, in Nix builds, we're at ~106 chars...
+ NIX_STATE_DIR="@GUIX_TEST_ROOT@/var/$$"
+
+ # We can't exit when we reach the limit, because perhaps the test doesn't
+ # actually rely on the daemon, but at least warn.
+ if test "`echo -n "$NIX_STATE_DIR/daemon-socket/socket" | wc -c`" -ge 108
+ then
+ echo "warning: exceeding socket file name limit; test may fail!" >&2
+ fi
+
+ # The configuration directory, for import/export signing keys.
+ NIX_CONF_DIR="@GUIX_TEST_ROOT@/etc"
+ if [ ! -d "$NIX_CONF_DIR" ]
+ then
+ # Copy the keys so that the secret key has the right permissions (the
+ # daemon errors out when this is not the case.)
+ mkdir -p "$NIX_CONF_DIR"
+ cp "@abs_top_srcdir@/tests/signing-key.sec" \
+ "@abs_top_srcdir@/tests/signing-key.pub" \
+ "$NIX_CONF_DIR"
+ chmod 400 "$NIX_CONF_DIR/signing-key.sec"
+ fi
+
+ # A place to store data of the substituter.
+ GUIX_BINARY_SUBSTITUTE_URL="file://$NIX_STATE_DIR/substituter-data"
+ rm -rf "$NIX_STATE_DIR/substituter-data"
+ mkdir -p "$NIX_STATE_DIR/substituter-data"
+
+ # For a number of tests, we want to allow unsigned narinfos, for
+ # simplicity.
+ GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES=yes
+
+ # Place for the substituter's cache.
+ XDG_CACHE_HOME="$NIX_STATE_DIR/cache-$$"
+
+ # For the (guix import snix) tests.
+ NIXPKGS="@NIXPKGS@"
+
+ export NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR \
+ NIX_LOCALSTATE_DIR NIX_LOG_DIR NIX_STATE_DIR NIX_DB_DIR \
+ NIX_ROOT_FINDER GUIX_BINARY_SUBSTITUTE_URL \
+ GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES \
+ NIX_CONF_DIR XDG_CACHE_HOME NIXPKGS
+
+ # Launch the daemon without chroot support because is may be
+ # unavailable, for instance if we're not running as root.
+ "@abs_top_builddir@/pre-inst-env" \
+ "@abs_top_builddir@/guix-daemon" --disable-chroot \
+ --substitute-urls="$GUIX_BINARY_SUBSTITUTE_URL" &
+
+ daemon_pid=$!
+ trap "kill $daemon_pid ; rm -rf $NIX_STATE_DIR" EXIT
+fi
+
+# Avoid issues that could stem from l10n, such as language/encoding
+# mismatches.
+unset LANGUAGE
+LC_MESSAGES=C
+export LC_MESSAGES
+
+# Disable grafts by default because they can cause things to be built
+# regardless of '--dry-run'.
+GUIX_BUILD_OPTIONS="--no-grafts"
+export GUIX_BUILD_OPTIONS
+
+# Ignore user settings.
+unset GUIX_PACKAGE_PATH
+
+storedir="@storedir@"
+prefix="@prefix@"
+datarootdir="@datarootdir@"
+datadir="@datadir@"
+localstatedir="@localstatedir@"
+export storedir prefix datarootdir datadir localstatedir
+
+"@abs_top_builddir@/pre-inst-env" "$@"
+exit $?
diff --git a/configure.ac b/configure.ac
index 6296b1f..7c6fcc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -211,8 +211,9 @@ AC_CONFIG_FILES([Makefile
guix/config.scm])
AC_CONFIG_FILES([scripts/guix], [chmod +x scripts/guix])
-AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])
-AC_CONFIG_FILES([test-env], [chmod +x test-env])
+AC_CONFIG_FILES([test-env:build-aux/test-env.in], [chmod +x test-env])
+AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in],
+ [chmod +x pre-inst-env])
dnl Emacs interface.
AC_PATH_PROG([DOT_USER_PROGRAM], [dot], [dot])
diff --git a/pre-inst-env.in b/pre-inst-env.in
deleted file mode 100644
index fe56da6..0000000
--- a/pre-inst-env.in
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
-#
-# 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/>.
-
-# Usage: ./pre-inst-env COMMAND ARG...
-#
-# Run COMMAND in a pre-installation environment. Typical use is
-# "./pre-inst-env guix build hello".
-
-# By default we may end up with absolute directory names that contain '..',
-# which get into $GUILE_LOAD_PATH, leading to '..' in the module file names
-# recorded by Guile. To avoid that, make sure we get a real absolute
-# directory name. Additionally, use '-P' to get the canonical directory name
-# so that Guile's 'relative' %file-port-name-canonicalization can actually
-# work (see <http://bugs.gnu.org/17935>.)
-abs_top_srcdir="`cd "@abs_top_srcdir@" > /dev/null; pwd -P`"
-abs_top_builddir="`cd "@abs_top_builddir@" > /dev/null; pwd -P`"
-
-GUILE_LOAD_COMPILED_PATH="$abs_top_builddir${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH"
-GUILE_LOAD_PATH="$abs_top_builddir:$abs_top_srcdir${GUILE_LOAD_PATH:+:}$GUILE_LOAD_PATH"
-export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH
-
-# Define $PATH so that `guix' and friends are easily found.
-
-PATH="$abs_top_builddir/scripts:$abs_top_builddir:$PATH"
-export PATH
-
-# Daemon helpers.
-
-NIX_ROOT_FINDER="$abs_top_builddir/nix/scripts/list-runtime-roots"
-NIX_SUBSTITUTERS="$abs_top_builddir/nix/scripts/substitute"
-NIX_BUILD_HOOK="$abs_top_builddir/nix/scripts/offload"
-NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" # for 'guix-authenticate'
-
-export NIX_ROOT_FINDER NIX_SUBSTITUTERS \
- NIX_BUILD_HOOK NIX_LIBEXEC_DIR
-
-# The 'guix-register' program.
-GUIX_REGISTER="$abs_top_builddir/guix-register"
-export GUIX_REGISTER
-
-# The following variables need only be defined when compiling Guix
-# modules, but we define them to be on the safe side in case of
-# auto-compilation.
-
-NIX_HASH="@NIX_HASH@"
-export NIX_HASH
-
-# Define $GUIX_UNINSTALLED to prevent `guix' from
-# prepending @guilemoduledir@ to the Guile load paths.
-
-GUIX_UNINSTALLED=1
-export GUIX_UNINSTALLED
-
-exec "$@"
diff --git a/test-env.in b/test-env.in
deleted file mode 100644
index c3f60f7..0000000
--- a/test-env.in
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/sh
-
-# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
-#
-# 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/>.
-
-# Usage: ./test-env COMMAND ARG...
-#
-# Run the daemon in the build directory, and run COMMAND within
-# `pre-inst-env'. This is used to run unit tests with the just-built
-# daemon, unless `--disable-daemon' was passed at configure time.
-
-
-# Make sure 'cd' behaves deterministically and doesn't write anything to
-# stdout.
-unset CDPATH
-
-if [ -x "@abs_top_builddir@/guix-daemon" ]
-then
- # Silence the daemon's output, which is often useless, as well as that of
- # Bash (such as "Terminated" messages when 'guix-daemon' is killed.)
- exec 2> /dev/null
-
- NIX_STORE_DIR="@GUIX_TEST_ROOT@/store"
-
- # Do that because store.scm calls `canonicalize-path' on it.
- mkdir -p "$NIX_STORE_DIR"
-
- # Canonicalize the store directory name in an attempt to avoid symlinks in
- # it or its parent directories. See <http://bugs.gnu.org/17935>.
- NIX_STORE_DIR="`cd "@GUIX_TEST_ROOT@/store"; pwd -P`"
-
- NIX_LOCALSTATE_DIR="@GUIX_TEST_ROOT@/var"
- NIX_LOG_DIR="@GUIX_TEST_ROOT@/var/log/guix"
- NIX_DB_DIR="@GUIX_TEST_ROOT@/db"
- NIX_ROOT_FINDER="@abs_top_builddir@/nix/scripts/list-runtime-roots"
-
- # Choose a PID-dependent name to allow for parallel builds. Note
- # that the directory name must be chosen so that the socket's file
- # name is less than 108-char long (the size of `sun_path' in glibc).
- # Currently, in Nix builds, we're at ~106 chars...
- NIX_STATE_DIR="@GUIX_TEST_ROOT@/var/$$"
-
- # We can't exit when we reach the limit, because perhaps the test doesn't
- # actually rely on the daemon, but at least warn.
- if test "`echo -n "$NIX_STATE_DIR/daemon-socket/socket" | wc -c`" -ge 108
- then
- echo "warning: exceeding socket file name limit; test may fail!" >&2
- fi
-
- # The configuration directory, for import/export signing keys.
- NIX_CONF_DIR="@GUIX_TEST_ROOT@/etc"
- if [ ! -d "$NIX_CONF_DIR" ]
- then
- # Copy the keys so that the secret key has the right permissions (the
- # daemon errors out when this is not the case.)
- mkdir -p "$NIX_CONF_DIR"
- cp "@abs_top_srcdir@/tests/signing-key.sec" \
- "@abs_top_srcdir@/tests/signing-key.pub" \
- "$NIX_CONF_DIR"
- chmod 400 "$NIX_CONF_DIR/signing-key.sec"
- fi
-
- # A place to store data of the substituter.
- GUIX_BINARY_SUBSTITUTE_URL="file://$NIX_STATE_DIR/substituter-data"
- rm -rf "$NIX_STATE_DIR/substituter-data"
- mkdir -p "$NIX_STATE_DIR/substituter-data"
-
- # For a number of tests, we want to allow unsigned narinfos, for
- # simplicity.
- GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES=yes
-
- # Place for the substituter's cache.
- XDG_CACHE_HOME="$NIX_STATE_DIR/cache-$$"
-
- # For the (guix import snix) tests.
- NIXPKGS="@NIXPKGS@"
-
- export NIX_IGNORE_SYMLINK_STORE NIX_STORE_DIR \
- NIX_LOCALSTATE_DIR NIX_LOG_DIR NIX_STATE_DIR NIX_DB_DIR \
- NIX_ROOT_FINDER GUIX_BINARY_SUBSTITUTE_URL \
- GUIX_ALLOW_UNAUTHENTICATED_SUBSTITUTES \
- NIX_CONF_DIR XDG_CACHE_HOME NIXPKGS
-
- # Launch the daemon without chroot support because is may be
- # unavailable, for instance if we're not running as root.
- "@abs_top_builddir@/pre-inst-env" \
- "@abs_top_builddir@/guix-daemon" --disable-chroot \
- --substitute-urls="$GUIX_BINARY_SUBSTITUTE_URL" &
-
- daemon_pid=$!
- trap "kill $daemon_pid ; rm -rf $NIX_STATE_DIR" EXIT
-fi
-
-# Avoid issues that could stem from l10n, such as language/encoding
-# mismatches.
-unset LANGUAGE
-LC_MESSAGES=C
-export LC_MESSAGES
-
-# Disable grafts by default because they can cause things to be built
-# regardless of '--dry-run'.
-GUIX_BUILD_OPTIONS="--no-grafts"
-export GUIX_BUILD_OPTIONS
-
-# Ignore user settings.
-unset GUIX_PACKAGE_PATH
-
-storedir="@storedir@"
-prefix="@prefix@"
-datarootdir="@datarootdir@"
-datadir="@datadir@"
-localstatedir="@localstatedir@"
-export storedir prefix datarootdir datadir localstatedir
-
-"@abs_top_builddir@/pre-inst-env" "$@"
-exit $?
^ permalink raw reply related [flat|nested] 15+ messages in thread