>From 420cb5c4a4cba223cea3361163edc511d3c4e08e Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Sat, 21 May 2016 22:50:43 +0200 Subject: [PATCH] build: Use "%D%" in Makefile fragments. * doc/local.mk: Use "%D%" for the directory of the fragment relative to the base 'Makefile.am'. * emacs/local.mk: Likewise. * gnu/local.mk: Likewise. * nix/local.mk: Likewise. --- doc/local.mk | 84 +-- emacs/local.mk | 74 +-- gnu/local.mk | 1584 ++++++++++++++++++++++++++++---------------------------- nix/local.mk | 138 ++--- 4 files changed, 940 insertions(+), 940 deletions(-) diff --git a/doc/local.mk b/doc/local.mk index b9f07c3..64bd2a5 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -20,49 +20,49 @@ # You should have received a copy of the GNU General Public License # along with GNU Guix. If not, see . -info_TEXINFOS = doc/guix.texi +info_TEXINFOS = %D%/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 + %D%/images/bootstrap-graph.dot \ + %D%/images/bootstrap-packages.dot \ + %D%/images/coreutils-graph.dot \ + %D%/images/coreutils-bag-graph.dot \ + %D%/images/service-graph.dot \ + %D%/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 \ + %D%/htmlxref.cnf \ + %D%/contributing.texi \ + %D%/emacs.texi \ + %D%/fdl-1.3.texi \ $(DOT_FILES) \ $(DOT_VECTOR_GRAPHICS) \ - doc/images/coreutils-size-map.eps \ - doc/environment-gdb.scm \ - doc/package-hello.scm + %D%/images/coreutils-size-map.eps \ + %D%/environment-gdb.scm \ + %D%/package-hello.scm OS_CONFIG_EXAMPLES_TEXI = \ - doc/os-config-bare-bones.texi \ - doc/os-config-desktop.texi \ - doc/os-config-lightweight-desktop.texi + %D%/os-config-bare-bones.texi \ + %D%/os-config-desktop.texi \ + %D%/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 +%D%/os-config-%.texi: gnu/system/examples/%.tmpl $(AM_V_GEN)$(MKDIR_P) "`dirname address@hidden"; \ cp "$<" "$@" infoimagedir = $(infodir)/images dist_infoimage_DATA = \ $(DOT_FILES:%.dot=%.png) \ - doc/images/coreutils-size-map.png + %D%/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. @@ -86,13 +86,13 @@ DOT_OPTIONS = \ $(AM_V_GEN)convert "$<" "address@hidden"; \ mv "address@hidden" "$@" -# We cannot add new dependencies to `doc/guix.pdf' & co. (info "(automake) +# We cannot add new dependencies to `%D%/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 + $(top_srcdir)/%D%/images/coreutils-size-map.eps dvi-local: ps-local ## ----------- ## @@ -106,25 +106,25 @@ dvi-local: ps-local # 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 + $(srcdir)/%D%/guix-archive.1 \ + $(srcdir)/%D%/guix-build.1 \ + $(srcdir)/%D%/guix-challenge.1 \ + $(srcdir)/%D%/guix-download.1 \ + $(srcdir)/%D%/guix-edit.1 \ + $(srcdir)/%D%/guix-environment.1 \ + $(srcdir)/%D%/guix-gc.1 \ + $(srcdir)/%D%/guix-hash.1 \ + $(srcdir)/%D%/guix-import.1 \ + $(srcdir)/%D%/guix-lint.1 \ + $(srcdir)/%D%/guix-package.1 \ + $(srcdir)/%D%/guix-publish.1 \ + $(srcdir)/%D%/guix-pull.1 \ + $(srcdir)/%D%/guix-refresh.1 \ + $(srcdir)/%D%/guix-size.1 \ + $(srcdir)/%D%/guix-system.1 dist_man1_MANS = \ - $(srcdir)/doc/guix.1 \ + $(srcdir)/%D%/guix.1 \ $(sub_commands_mans) gen_man = \ @@ -133,14 +133,14 @@ gen_man = \ HELP2MANFLAGS = --source=GNU --info-page=$(PACKAGE_TARNAME) -$(srcdir)/doc/guix.1: scripts/guix.in $(sub_commands_mans) +$(srcdir)/%D%/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) +$(srcdir)/%D%/guix-%.1: guix/scripts/%.scm $(GOBJECTS) address@hidden '$?' in \ *$<*) $(AM_V_P) && set -x || echo " HELP2MAN $@"; \ $(gen_man) --output="$@" "guix $*";; \ @@ -149,9 +149,9 @@ $(srcdir)/doc/guix-%.1: guix/scripts/%.scm $(GOBJECTS) if BUILD_DAEMON -dist_man1_MANS += $(srcdir)/doc/guix-daemon.1 +dist_man1_MANS += $(srcdir)/%D%/guix-daemon.1 -$(srcdir)/doc/guix-daemon.1: nix/nix-daemon/guix-daemon.cc +$(srcdir)/%D%/guix-daemon.1: nix/nix-daemon/guix-daemon.cc -$(AM_V_HELP2MAN)$(gen_man) --output="$@" `basename "$@" .1` endif diff --git a/emacs/local.mk b/emacs/local.mk index f83063c..959ec2d 100644 --- a/emacs/local.mk +++ b/emacs/local.mk @@ -17,51 +17,51 @@ # You should have received a copy of the GNU General Public License # along with GNU Guix. If not, see . -AUTOLOADS = emacs/guix-autoloads.el +AUTOLOADS = %D%/guix-autoloads.el ELFILES = \ - emacs/guix-about.el \ - 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-location.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-license.el \ - emacs/guix-ui-location.el \ - emacs/guix-ui-package.el \ - emacs/guix-ui-generation.el \ - emacs/guix-ui-system-generation.el \ - emacs/guix-utils.el + %D%/guix-about.el \ + %D%/guix-backend.el \ + %D%/guix-base.el \ + %D%/guix-build-log.el \ + %D%/guix-buffer.el \ + %D%/guix-command.el \ + %D%/guix-devel.el \ + %D%/guix-emacs.el \ + %D%/guix-entry.el \ + %D%/guix-external.el \ + %D%/guix-geiser.el \ + %D%/guix-guile.el \ + %D%/guix-help-vars.el \ + %D%/guix-history.el \ + %D%/guix-hydra.el \ + %D%/guix-hydra-build.el \ + %D%/guix-hydra-jobset.el \ + %D%/guix-info.el \ + %D%/guix-init.el \ + %D%/guix-license.el \ + %D%/guix-list.el \ + %D%/guix-location.el \ + %D%/guix-messages.el \ + %D%/guix-pcomplete.el \ + %D%/guix-popup.el \ + %D%/guix-prettify.el \ + %D%/guix-profiles.el \ + %D%/guix-read.el \ + %D%/guix-ui.el \ + %D%/guix-ui-license.el \ + %D%/guix-ui-location.el \ + %D%/guix-ui-package.el \ + %D%/guix-ui-generation.el \ + %D%/guix-ui-system-generation.el \ + %D%/guix-utils.el if HAVE_EMACS dist_lisp_DATA = $(ELFILES) nodist_lisp_DATA = \ - emacs/guix-config.el \ + %D%/guix-config.el \ $(AUTOLOADS) $(AUTOLOADS): $(ELFILES) diff --git a/gnu/local.mk b/gnu/local.mk index 5655a05..e4a46b2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -26,823 +26,823 @@ 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/anthy.scm \ - gnu/packages/apl.scm \ - gnu/packages/apr.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/c.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/connman.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/dillo.scm \ - gnu/packages/disk.scm \ - gnu/packages/djvu.scm \ - gnu/packages/dns.scm \ - gnu/packages/docbook.scm \ - gnu/packages/docker.scm \ - gnu/packages/documentation.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/entr.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/libbsd.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/marst.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 \ + %D%/artwork.scm \ + %D%/packages.scm \ + %D%/packages/abduco.scm \ + %D%/packages/abiword.scm \ + %D%/packages/acct.scm \ + %D%/packages/acl.scm \ + %D%/packages/admin.scm \ + %D%/packages/adns.scm \ + %D%/packages/algebra.scm \ + %D%/packages/aidc.scm \ + %D%/packages/animation.scm \ + %D%/packages/anthy.scm \ + %D%/packages/apl.scm \ + %D%/packages/apr.scm \ + %D%/packages/aspell.scm \ + %D%/packages/attr.scm \ + %D%/packages/audacity.scm \ + %D%/packages/audio.scm \ + %D%/packages/augeas.scm \ + %D%/packages/autogen.scm \ + %D%/packages/autotools.scm \ + %D%/packages/avahi.scm \ + %D%/packages/avr.scm \ + %D%/packages/backup.scm \ + %D%/packages/base.scm \ + %D%/packages/bash.scm \ + %D%/packages/bdw-gc.scm \ + %D%/packages/bioinformatics.scm \ + %D%/packages/bittorrent.scm \ + %D%/packages/bison.scm \ + %D%/packages/boost.scm \ + %D%/packages/bootstrap.scm \ + %D%/packages/busybox.scm \ + %D%/packages/c.scm \ + %D%/packages/calcurse.scm \ + %D%/packages/ccache.scm \ + %D%/packages/cdrom.scm \ + %D%/packages/certs.scm \ + %D%/packages/check.scm \ + %D%/packages/ci.scm \ + %D%/packages/cmake.scm \ + %D%/packages/code.scm \ + %D%/packages/commencement.scm \ + %D%/packages/compression.scm \ + %D%/packages/conkeror.scm \ + %D%/packages/conky.scm \ + %D%/packages/connman.scm \ + %D%/packages/cook.scm \ + %D%/packages/cpio.scm \ + %D%/packages/cppi.scm \ + %D%/packages/cross-base.scm \ + %D%/packages/crypto.scm \ + %D%/packages/cryptsetup.scm \ + %D%/packages/cups.scm \ + %D%/packages/curl.scm \ + %D%/packages/cyrus-sasl.scm \ + %D%/packages/databases.scm \ + %D%/packages/datamash.scm \ + %D%/packages/datastructures.scm \ + %D%/packages/dav.scm \ + %D%/packages/dc.scm \ + %D%/packages/debug.scm \ + %D%/packages/dejagnu.scm \ + %D%/packages/dico.scm \ + %D%/packages/dictionaries.scm \ + %D%/packages/dillo.scm \ + %D%/packages/disk.scm \ + %D%/packages/djvu.scm \ + %D%/packages/dns.scm \ + %D%/packages/docbook.scm \ + %D%/packages/docker.scm \ + %D%/packages/documentation.scm \ + %D%/packages/dunst.scm \ + %D%/packages/dvtm.scm \ + %D%/packages/ebook.scm \ + %D%/packages/ed.scm \ + %D%/packages/elf.scm \ + %D%/packages/emacs.scm \ + %D%/packages/enchant.scm \ + %D%/packages/engineering.scm \ + %D%/packages/enlightenment.scm \ + %D%/packages/entr.scm \ + %D%/packages/fcitx.scm \ + %D%/packages/feh.scm \ + %D%/packages/figlet.scm \ + %D%/packages/file.scm \ + %D%/packages/finance.scm \ + %D%/packages/firmware.scm \ + %D%/packages/fish.scm \ + %D%/packages/flashing-tools.scm \ + %D%/packages/flex.scm \ + %D%/packages/fltk.scm \ + %D%/packages/fonts.scm \ + %D%/packages/fontutils.scm \ + %D%/packages/freedesktop.scm \ + %D%/packages/freeipmi.scm \ + %D%/packages/ftp.scm \ + %D%/packages/fribidi.scm \ + %D%/packages/fvwm.scm \ + %D%/packages/game-development.scm \ + %D%/packages/games.scm \ + %D%/packages/gawk.scm \ + %D%/packages/gcal.scm \ + %D%/packages/gcc.scm \ + %D%/packages/gd.scm \ + %D%/packages/gdb.scm \ + %D%/packages/geeqie.scm \ + %D%/packages/gettext.scm \ + %D%/packages/ghostscript.scm \ + %D%/packages/gimp.scm \ + %D%/packages/gkrellm.scm \ + %D%/packages/gl.scm \ + %D%/packages/glib.scm \ + %D%/packages/gnome.scm \ + %D%/packages/gnu-doc.scm \ + %D%/packages/gnucash.scm \ + %D%/packages/gnunet.scm \ + %D%/packages/gnupg.scm \ + %D%/packages/gnustep.scm \ + %D%/packages/gnuzilla.scm \ + %D%/packages/gnu-pw-mgr.scm \ + %D%/packages/gperf.scm \ + %D%/packages/gprolog.scm \ + %D%/packages/gps.scm \ + %D%/packages/graphics.scm \ + %D%/packages/graphviz.scm \ + %D%/packages/groff.scm \ + %D%/packages/grub.scm \ + %D%/packages/grue-hunter.scm \ + %D%/packages/gsasl.scm \ + %D%/packages/gstreamer.scm \ + %D%/packages/gtk.scm \ + %D%/packages/guile.scm \ + %D%/packages/guile-wm.scm \ + %D%/packages/gv.scm \ + %D%/packages/gxmessage.scm \ + %D%/packages/haskell.scm \ + %D%/packages/hugs.scm \ + %D%/packages/hurd.scm \ + %D%/packages/ibus.scm \ + %D%/packages/icu4c.scm \ + %D%/packages/idutils.scm \ + %D%/packages/image.scm \ + %D%/packages/imagemagick.scm \ + %D%/packages/indent.scm \ + %D%/packages/inklingreader.scm \ + %D%/packages/inkscape.scm \ + %D%/packages/irc.scm \ + %D%/packages/iso-codes.scm \ + %D%/packages/java.scm \ + %D%/packages/jemalloc.scm \ + %D%/packages/jrnl.scm \ + %D%/packages/julia.scm \ + %D%/packages/kde.scm \ + %D%/packages/kde-frameworks.scm \ + %D%/packages/key-mon.scm \ + %D%/packages/kodi.scm \ + %D%/packages/language.scm \ + %D%/packages/ldc.scm \ + %D%/packages/lego.scm \ + %D%/packages/less.scm \ + %D%/packages/lesstif.scm \ + %D%/packages/libbsd.scm \ + %D%/packages/libcanberra.scm \ + %D%/packages/libdaemon.scm \ + %D%/packages/libedit.scm \ + %D%/packages/libevent.scm \ + %D%/packages/libffcall.scm \ + %D%/packages/libffi.scm \ + %D%/packages/libftdi.scm \ + %D%/packages/calendar.scm \ + %D%/packages/libidn.scm \ + %D%/packages/libphidget.scm \ + %D%/packages/libreoffice.scm \ + %D%/packages/libsigsegv.scm \ + %D%/packages/libunistring.scm \ + %D%/packages/libusb.scm \ + %D%/packages/libunwind.scm \ + %D%/packages/libupnp.scm \ + %D%/packages/lightning.scm \ + %D%/packages/links.scm \ + %D%/packages/linux.scm \ + %D%/packages/lirc.scm \ + %D%/packages/lisp.scm \ + %D%/packages/llvm.scm \ + %D%/packages/lout.scm \ + %D%/packages/lsh.scm \ + %D%/packages/lsof.scm \ + %D%/packages/lua.scm \ + %D%/packages/lxde.scm \ + %D%/packages/lxqt.scm \ + %D%/packages/lynx.scm \ + %D%/packages/m4.scm \ + %D%/packages/machine-learning.scm \ + %D%/packages/man.scm \ + %D%/packages/mail.scm \ + %D%/packages/make-bootstrap.scm \ + %D%/packages/markdown.scm \ + %D%/packages/marst.scm \ + %D%/packages/mate.scm \ + %D%/packages/maths.scm \ + %D%/packages/mc.scm \ + %D%/packages/mcrypt.scm \ + %D%/packages/messaging.scm \ + %D%/packages/mg.scm \ + %D%/packages/mit-krb5.scm \ + %D%/packages/moe.scm \ + %D%/packages/moreutils.scm \ + %D%/packages/mpd.scm \ + %D%/packages/mp3.scm \ + %D%/packages/mpi.scm \ + %D%/packages/multiprecision.scm \ + %D%/packages/music.scm \ + %D%/packages/mtools.scm \ + %D%/packages/nano.scm \ + %D%/packages/ncdu.scm \ + %D%/packages/ncurses.scm \ + %D%/packages/netpbm.scm \ + %D%/packages/nettle.scm \ + %D%/packages/networking.scm \ + %D%/packages/ninja.scm \ + %D%/packages/node.scm \ + %D%/packages/noweb.scm \ + %D%/packages/ntp.scm \ + %D%/packages/nutrition.scm \ + %D%/packages/nvi.scm \ + %D%/packages/ocaml.scm \ + %D%/packages/ocr.scm \ + %D%/packages/onc-rpc.scm \ + %D%/packages/openbox.scm \ + %D%/packages/openldap.scm \ + %D%/packages/openstack.scm \ + %D%/packages/orpheus.scm \ + %D%/packages/ots.scm \ + %D%/packages/owncloud.scm \ + %D%/packages/package-management.scm \ + %D%/packages/parallel.scm \ + %D%/packages/password-utils.scm \ + %D%/packages/patchutils.scm \ + %D%/packages/pciutils.scm \ + %D%/packages/pcre.scm \ + %D%/packages/pdf.scm \ + %D%/packages/pem.scm \ + %D%/packages/perl.scm \ + %D%/packages/photo.scm \ + %D%/packages/pkg-config.scm \ + %D%/packages/plotutils.scm \ + %D%/packages/polkit.scm \ + %D%/packages/popt.scm \ + %D%/packages/pth.scm \ + %D%/packages/pulseaudio.scm \ + %D%/packages/pumpio.scm \ + %D%/packages/pretty-print.scm \ + %D%/packages/protobuf.scm \ + %D%/packages/pv.scm \ + %D%/packages/python.scm \ + %D%/packages/qemu.scm \ + %D%/packages/qt.scm \ + %D%/packages/ragel.scm \ + %D%/packages/ratpoison.scm \ + %D%/packages/rc.scm \ + %D%/packages/rdesktop.scm \ + %D%/packages/rdf.scm \ + %D%/packages/readline.scm \ + %D%/packages/rrdtool.scm \ + %D%/packages/rsync.scm \ + %D%/packages/ruby.scm \ + %D%/packages/rush.scm \ + %D%/packages/samba.scm \ + %D%/packages/sawfish.scm \ + %D%/packages/scanner.scm \ + %D%/packages/scheme.scm \ + %D%/packages/screen.scm \ + %D%/packages/scribus.scm \ + %D%/packages/sdl.scm \ + %D%/packages/search.scm \ + %D%/packages/serialization.scm \ + %D%/packages/serveez.scm \ + %D%/packages/shishi.scm \ + %D%/packages/skarnet.scm \ + %D%/packages/skribilo.scm \ + %D%/packages/slang.scm \ + %D%/packages/slim.scm \ + %D%/packages/smalltalk.scm \ + %D%/packages/ssh.scm \ + %D%/packages/stalonetray.scm \ + %D%/packages/statistics.scm \ + %D%/packages/suckless.scm \ + %D%/packages/swig.scm \ + %D%/packages/sxiv.scm \ + %D%/packages/synergy.scm \ + %D%/packages/task-management.scm \ + %D%/packages/tbb.scm \ + %D%/packages/tcl.scm \ + %D%/packages/tcsh.scm \ + %D%/packages/telephony.scm \ + %D%/packages/terminals.scm \ + %D%/packages/texinfo.scm \ + %D%/packages/texlive.scm \ + %D%/packages/textutils.scm \ + %D%/packages/time.scm \ + %D%/packages/tls.scm \ + %D%/packages/tmux.scm \ + %D%/packages/tor.scm \ + %D%/packages/tre.scm \ + %D%/packages/tv.scm \ + %D%/packages/unrtf.scm \ + %D%/packages/upnp.scm \ + %D%/packages/uucp.scm \ + %D%/packages/valgrind.scm \ + %D%/packages/version-control.scm \ + %D%/packages/video.scm \ + %D%/packages/vim.scm \ + %D%/packages/vpn.scm \ + %D%/packages/vtk.scm \ + %D%/packages/w3m.scm \ + %D%/packages/wdiff.scm \ + %D%/packages/web.scm \ + %D%/packages/webkit.scm \ + %D%/packages/wget.scm \ + %D%/packages/wicd.scm \ + %D%/packages/wine.scm \ + %D%/packages/wm.scm \ + %D%/packages/wordnet.scm \ + %D%/packages/wv.scm \ + %D%/packages/wxwidgets.scm \ + %D%/packages/xfig.scm \ + %D%/packages/xiph.scm \ + %D%/packages/xml.scm \ + %D%/packages/xnee.scm \ + %D%/packages/xdisorg.scm \ + %D%/packages/xorg.scm \ + %D%/packages/xfce.scm \ + %D%/packages/yasm.scm \ + %D%/packages/yubico.scm \ + %D%/packages/zile.scm \ + %D%/packages/zip.scm \ + %D%/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 \ + %D%/services.scm \ + %D%/services/avahi.scm \ + %D%/services/base.scm \ + %D%/services/databases.scm \ + %D%/services/dbus.scm \ + %D%/services/desktop.scm \ + %D%/services/lirc.scm \ + %D%/services/mail.scm \ + %D%/services/networking.scm \ + %D%/services/shepherd.scm \ + %D%/services/herd.scm \ + %D%/services/ssh.scm \ + %D%/services/web.scm \ + %D%/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/mapped-devices.scm \ - gnu/system/nss.scm \ - gnu/system/pam.scm \ - gnu/system/shadow.scm \ - gnu/system/vm.scm \ + %D%/system.scm \ + %D%/system/file-systems.scm \ + %D%/system/grub.scm \ + %D%/system/install.scm \ + %D%/system/linux-container.scm \ + %D%/system/linux-initrd.scm \ + %D%/system/locale.scm \ + %D%/system/mapped-devices.scm \ + %D%/system/nss.scm \ + %D%/system/pam.scm \ + %D%/system/shadow.scm \ + %D%/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/marionette.scm \ - gnu/build/vm.scm \ + %D%/build/activation.scm \ + %D%/build/file-systems.scm \ + %D%/build/install.scm \ + %D%/build/linux-boot.scm \ + %D%/build/linux-container.scm \ + %D%/build/linux-initrd.scm \ + %D%/build/linux-modules.scm \ + %D%/build/marionette.scm \ + %D%/build/vm.scm \ \ - gnu/tests.scm \ - gnu/tests/base.scm + %D%/tests.scm \ + %D%/tests/base.scm -patchdir = $(guilemoduledir)/gnu/packages/patches +patchdir = $(guilemoduledir)/%D%/packages/patches dist_patch_DATA = \ - gnu/packages/patches/4store-fix-buildsystem.patch \ - gnu/packages/patches/abiword-explictly-cast-bools.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/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/doc++-include-directives.patch \ - gnu/packages/patches/doc++-segfault-fix.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-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/expat-CVE-2015-1283-refix.patch \ - gnu/packages/patches/expat-CVE-2016-0718.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/fltk-xfont-on-demand.patch \ - gnu/packages/patches/fontforge-svg-modtime.patch \ - gnu/packages/patches/fossil-test-fixes.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/gd-CVE-2016-3074.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-timer.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/gnome-tweak-tool-search-paths.patch \ - gnu/packages/patches/gnucash-price-quotes-perl.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/gtk2-theme-paths.patch \ - gnu/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \ - gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \ - gnu/packages/patches/hdf5-config-date.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/hypre-doc-tables.patch \ - gnu/packages/patches/hypre-ldflags.patch \ - gnu/packages/patches/icecat-avoid-bundled-includes.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/inkscape-drop-wait-for-targets.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-CVE-2016-1541.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/libextractor-ffmpeg-3.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/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/netcdf-config-date.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-CVE-2015-8869.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/openssh-CVE-2015-8325.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/pcre-CVE-2016-3191.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/portmidi-modular-build.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/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/ruby-symlinkfix.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/ttf2eot-cstddef.patch \ - gnu/packages/patches/ttfautohint-source-date-epoch.patch \ - gnu/packages/patches/tophat-build-with-later-seqan.patch \ - gnu/packages/patches/torsocks-dns-test.patch \ - gnu/packages/patches/totem-debug-format-fix.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/woff2-libbrotli.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/wpa-supplicant-CVE-2016-4476.patch \ - gnu/packages/patches/wpa-supplicant-CVE-2016-4477-pt1.patch \ - gnu/packages/patches/wpa-supplicant-CVE-2016-4477-pt2.patch \ - gnu/packages/patches/wpa-supplicant-CVE-2016-4477-pt3.patch \ - gnu/packages/patches/wpa-supplicant-CVE-2016-4477-pt4.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 + %D%/packages/patches/4store-fix-buildsystem.patch \ + %D%/packages/patches/abiword-explictly-cast-bools.patch \ + %D%/packages/patches/abiword-wmf-version-lookup-fix.patch \ + %D%/packages/patches/acl-hurd-path-max.patch \ + %D%/packages/patches/aegis-constness-error.patch \ + %D%/packages/patches/aegis-perl-tempdir1.patch \ + %D%/packages/patches/aegis-perl-tempdir2.patch \ + %D%/packages/patches/aegis-test-fixup-1.patch \ + %D%/packages/patches/aegis-test-fixup-2.patch \ + %D%/packages/patches/agg-am_c_prototype.patch \ + %D%/packages/patches/alsa-lib-mips-atomic-fix.patch \ + %D%/packages/patches/apr-skip-getservbyname-test.patch \ + %D%/packages/patches/arb-ldconfig.patch \ + %D%/packages/patches/ath9k-htc-firmware-binutils.patch \ + %D%/packages/patches/ath9k-htc-firmware-gcc.patch \ + %D%/packages/patches/ath9k-htc-firmware-objcopy.patch \ + %D%/packages/patches/audacity-fix-ffmpeg-binding.patch \ + %D%/packages/patches/automake-skip-amhello-tests.patch \ + %D%/packages/patches/automake-regexp-syntax.patch \ + %D%/packages/patches/avahi-localstatedir.patch \ + %D%/packages/patches/avidemux-install-to-lib.patch \ + %D%/packages/patches/avrdude-fix-libusb.patch \ + %D%/packages/patches/bash-completion-directories.patch \ + %D%/packages/patches/bigloo-gc-shebangs.patch \ + %D%/packages/patches/binutils-ld-new-dtags.patch \ + %D%/packages/patches/binutils-loongson-workaround.patch \ + %D%/packages/patches/byobu-writable-status.patch \ + %D%/packages/patches/calibre-drop-unrar.patch \ + %D%/packages/patches/calibre-no-updates-dialog.patch \ + %D%/packages/patches/cdparanoia-fpic.patch \ + %D%/packages/patches/chmlib-inttypes.patch \ + %D%/packages/patches/clang-libc-search-path.patch \ + %D%/packages/patches/clucene-pkgconfig.patch \ + %D%/packages/patches/cmake-fix-tests.patch \ + %D%/packages/patches/cpio-gets-undeclared.patch \ + %D%/packages/patches/cpio-CVE-2016-2037.patch \ + %D%/packages/patches/cpufrequtils-fix-aclocal.patch \ + %D%/packages/patches/crda-optional-gcrypt.patch \ + %D%/packages/patches/crossmap-allow-system-pysam.patch \ + %D%/packages/patches/csound-header-ordering.patch \ + %D%/packages/patches/cssc-gets-undeclared.patch \ + %D%/packages/patches/cssc-missing-include.patch \ + %D%/packages/patches/clucene-contribs-lib.patch \ + %D%/packages/patches/cursynth-wave-rand.patch \ + %D%/packages/patches/dbus-helper-search-path.patch \ + %D%/packages/patches/dealii-p4est-interface.patch \ + %D%/packages/patches/devil-fix-libpng.patch \ + %D%/packages/patches/dico-libtool-deterministic.patch \ + %D%/packages/patches/diffutils-gets-undeclared.patch \ + %D%/packages/patches/dfu-programmer-fix-libusb.patch \ + %D%/packages/patches/doc++-include-directives.patch \ + %D%/packages/patches/doc++-segfault-fix.patch \ + %D%/packages/patches/doxygen-test.patch \ + %D%/packages/patches/duplicity-piped-password.patch \ + %D%/packages/patches/duplicity-test_selection-tmp.patch \ + %D%/packages/patches/elfutils-tests-ptrace.patch \ + %D%/packages/patches/einstein-build.patch \ + %D%/packages/patches/emacs-exec-path.patch \ + %D%/packages/patches/emacs-scheme-complete-scheme-r5rs-info.patch \ + %D%/packages/patches/emacs-source-date-epoch.patch \ + %D%/packages/patches/eudev-rules-directory.patch \ + %D%/packages/patches/evilwm-lost-focus-bug.patch \ + %D%/packages/patches/expat-CVE-2015-1283.patch \ + %D%/packages/patches/expat-CVE-2015-1283-refix.patch \ + %D%/packages/patches/expat-CVE-2016-0718.patch \ + %D%/packages/patches/fastcap-mulGlobal.patch \ + %D%/packages/patches/fastcap-mulSetup.patch \ + %D%/packages/patches/fasthenry-spAllocate.patch \ + %D%/packages/patches/fasthenry-spBuild.patch \ + %D%/packages/patches/fasthenry-spUtils.patch \ + %D%/packages/patches/fasthenry-spSolve.patch \ + %D%/packages/patches/fasthenry-spFactor.patch \ + %D%/packages/patches/findutils-localstatedir.patch \ + %D%/packages/patches/findutils-test-xargs.patch \ + %D%/packages/patches/flashrom-use-libftdi1.patch \ + %D%/packages/patches/flint-ldconfig.patch \ + %D%/packages/patches/fltk-shared-lib-defines.patch \ + %D%/packages/patches/fltk-xfont-on-demand.patch \ + %D%/packages/patches/fontforge-svg-modtime.patch \ + %D%/packages/patches/fossil-test-fixes.patch \ + %D%/packages/patches/freeimage-CVE-2015-0852.patch \ + %D%/packages/patches/gawk-fts-test.patch \ + %D%/packages/patches/gawk-shell.patch \ + %D%/packages/patches/gcc-arm-link-spec-fix.patch \ + %D%/packages/patches/gcc-cross-environment-variables.patch \ + %D%/packages/patches/gcc-libvtv-runpath.patch \ + %D%/packages/patches/gcc-5.0-libvtv-runpath.patch \ + %D%/packages/patches/gd-CVE-2016-3074.patch \ + %D%/packages/patches/geoclue-config.patch \ + %D%/packages/patches/ghostscript-CVE-2015-3228.patch \ + %D%/packages/patches/ghostscript-runpath.patch \ + %D%/packages/patches/glib-networking-ssl-cert-file.patch \ + %D%/packages/patches/glib-tests-timer.patch \ + %D%/packages/patches/glibc-CVE-2015-7547.patch \ + %D%/packages/patches/glibc-bootstrap-system.patch \ + %D%/packages/patches/glibc-hurd-extern-inline.patch \ + %D%/packages/patches/glibc-ldd-x86_64.patch \ + %D%/packages/patches/glibc-locales.patch \ + %D%/packages/patches/glibc-locale-incompatibility.patch \ + %D%/packages/patches/glibc-o-largefile.patch \ + %D%/packages/patches/glibc-versioned-locpath.patch \ + %D%/packages/patches/gmp-arm-asm-nothumb.patch \ + %D%/packages/patches/gmp-faulty-test.patch \ + %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ + %D%/packages/patches/gnucash-price-quotes-perl.patch \ + %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ + %D%/packages/patches/gobject-introspection-cc.patch \ + %D%/packages/patches/gobject-introspection-girepository.patch \ + %D%/packages/patches/grep-timing-sensitive-test.patch \ + %D%/packages/patches/grub-CVE-2015-8370.patch \ + %D%/packages/patches/grub-gets-undeclared.patch \ + %D%/packages/patches/grub-freetype.patch \ + %D%/packages/patches/guile-1.8-cpp-4.5.patch \ + %D%/packages/patches/guile-arm-fixes.patch \ + %D%/packages/patches/guile-default-utf8.patch \ + %D%/packages/patches/guile-linux-syscalls.patch \ + %D%/packages/patches/guile-present-coding.patch \ + %D%/packages/patches/guile-relocatable.patch \ + %D%/packages/patches/guile-rsvg-pkgconfig.patch \ + %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ + %D%/packages/patches/gtk2-theme-paths.patch \ + %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \ + %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ + %D%/packages/patches/hdf5-config-date.patch \ + %D%/packages/patches/hop-bigloo-4.0b.patch \ + %D%/packages/patches/hop-linker-flags.patch \ + %D%/packages/patches/hydra-automake-1.15.patch \ + %D%/packages/patches/hydra-disable-darcs-test.patch \ + %D%/packages/patches/hypre-doc-tables.patch \ + %D%/packages/patches/hypre-ldflags.patch \ + %D%/packages/patches/icecat-avoid-bundled-includes.patch \ + %D%/packages/patches/icu4c-CVE-2014-6585.patch \ + %D%/packages/patches/icu4c-CVE-2015-1270.patch \ + %D%/packages/patches/icu4c-CVE-2015-4760.patch \ + %D%/packages/patches/ilmbase-fix-tests.patch \ + %D%/packages/patches/inkscape-drop-wait-for-targets.patch \ + %D%/packages/patches/irrlicht-mesa-10.patch \ + %D%/packages/patches/jasper-CVE-2007-2721.patch \ + %D%/packages/patches/jasper-CVE-2008-3520.patch \ + %D%/packages/patches/jasper-CVE-2008-3522.patch \ + %D%/packages/patches/jasper-CVE-2011-4516-and-CVE-2011-4517.patch \ + %D%/packages/patches/jasper-CVE-2014-8137.patch \ + %D%/packages/patches/jasper-CVE-2014-8138.patch \ + %D%/packages/patches/jasper-CVE-2014-8157.patch \ + %D%/packages/patches/jasper-CVE-2014-8158.patch \ + %D%/packages/patches/jasper-CVE-2014-9029.patch \ + %D%/packages/patches/jasper-CVE-2016-1577.patch \ + %D%/packages/patches/jasper-CVE-2016-1867.patch \ + %D%/packages/patches/jasper-CVE-2016-2089.patch \ + %D%/packages/patches/jasper-CVE-2016-2116.patch \ + %D%/packages/patches/jbig2dec-ignore-testtest.patch \ + %D%/packages/patches/kmod-module-directory.patch \ + %D%/packages/patches/ldc-disable-tests.patch \ + %D%/packages/patches/lftp-dont-save-unknown-host-fingerprint.patch \ + %D%/packages/patches/liba52-enable-pic.patch \ + %D%/packages/patches/liba52-link-with-libm.patch \ + %D%/packages/patches/liba52-set-soname.patch \ + %D%/packages/patches/liba52-use-mtune-not-mcpu.patch \ + %D%/packages/patches/libarchive-bsdtar-test.patch \ + %D%/packages/patches/libarchive-CVE-2013-0211.patch \ + %D%/packages/patches/libarchive-CVE-2016-1541.patch \ + %D%/packages/patches/libarchive-fix-lzo-test-case.patch \ + %D%/packages/patches/libarchive-mtree-filename-length-fix.patch \ + %D%/packages/patches/libbonobo-activation-test-race.patch \ + %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ + %D%/packages/patches/libcmis-fix-test-onedrive.patch \ + %D%/packages/patches/libdrm-symbol-check.patch \ + %D%/packages/patches/libevent-dns-tests.patch \ + %D%/packages/patches/libextractor-ffmpeg-3.patch \ + %D%/packages/patches/libmtp-devices.patch \ + %D%/packages/patches/liboop-mips64-deplibs-fix.patch \ + %D%/packages/patches/libotr-test-auth-fix.patch \ + %D%/packages/patches/liblxqt-include.patch \ + %D%/packages/patches/libmad-armv7-thumb-pt1.patch \ + %D%/packages/patches/libmad-armv7-thumb-pt2.patch \ + %D%/packages/patches/libmad-frame-length.patch \ + %D%/packages/patches/libmad-mips-newgcc.patch \ + %D%/packages/patches/libssh-0.6.5-CVE-2016-0739.patch \ + %D%/packages/patches/libtheora-config-guess.patch \ + %D%/packages/patches/libtiff-CVE-2015-8665+CVE-2015-8683.patch \ + %D%/packages/patches/libtiff-oob-accesses-in-decode.patch \ + %D%/packages/patches/libtiff-oob-write-in-nextdecode.patch \ + %D%/packages/patches/libtool-skip-tests2.patch \ + %D%/packages/patches/libunwind-CVE-2015-3239.patch \ + %D%/packages/patches/libwmf-CAN-2004-0941.patch \ + %D%/packages/patches/libwmf-CVE-2006-3376.patch \ + %D%/packages/patches/libwmf-CVE-2007-0455.patch \ + %D%/packages/patches/libwmf-CVE-2007-2756.patch \ + %D%/packages/patches/libwmf-CVE-2007-3472.patch \ + %D%/packages/patches/libwmf-CVE-2007-3473.patch \ + %D%/packages/patches/libwmf-CVE-2007-3477.patch \ + %D%/packages/patches/libwmf-CVE-2009-1364.patch \ + %D%/packages/patches/libwmf-CVE-2009-3546.patch \ + %D%/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch \ + %D%/packages/patches/libwmf-CVE-2015-4695.patch \ + %D%/packages/patches/libwmf-CVE-2015-4696.patch \ + %D%/packages/patches/libxslt-CVE-2015-7995.patch \ + %D%/packages/patches/lirc-localstatedir.patch \ + %D%/packages/patches/libpthread-glibc-preparation.patch \ + %D%/packages/patches/lm-sensors-hwmon-attrs.patch \ + %D%/packages/patches/lua-pkgconfig.patch \ + %D%/packages/patches/lua51-liblua-so.patch \ + %D%/packages/patches/lua52-liblua-so.patch \ + %D%/packages/patches/luajit-no_ldconfig.patch \ + %D%/packages/patches/luajit-symlinks.patch \ + %D%/packages/patches/luit-posix.patch \ + %D%/packages/patches/m4-gets-undeclared.patch \ + %D%/packages/patches/make-impure-dirs.patch \ + %D%/packages/patches/mars-install.patch \ + %D%/packages/patches/mars-sfml-2.3.patch \ + %D%/packages/patches/matplotlib-setupext-tk.patch \ + %D%/packages/patches/maxima-defsystem-mkdir.patch \ + %D%/packages/patches/mcron-install.patch \ + %D%/packages/patches/mhash-keygen-test-segfault.patch \ + %D%/packages/patches/mit-krb5-CVE-2015-8629.patch \ + %D%/packages/patches/mit-krb5-CVE-2015-8630.patch \ + %D%/packages/patches/mit-krb5-CVE-2015-8631.patch \ + %D%/packages/patches/mit-krb5-init-context-null-spnego.patch \ + %D%/packages/patches/mpc123-initialize-ao.patch \ + %D%/packages/patches/mplayer2-theora-fix.patch \ + %D%/packages/patches/module-init-tools-moduledir.patch \ + %D%/packages/patches/mumps-build-parallelism.patch \ + %D%/packages/patches/mupen64plus-ui-console-notice.patch \ + %D%/packages/patches/mutt-store-references.patch \ + %D%/packages/patches/net-tools-bitrot.patch \ + %D%/packages/patches/netcdf-config-date.patch \ + %D%/packages/patches/ngircd-handle-zombies.patch \ + %D%/packages/patches/ngircd-no-dns-in-tests.patch \ + %D%/packages/patches/ninja-tests.patch \ + %D%/packages/patches/ninja-zero-mtime.patch \ + %D%/packages/patches/nss-pkgconfig.patch \ + %D%/packages/patches/nvi-assume-preserve-path.patch \ + %D%/packages/patches/nvi-dbpagesize-binpower.patch \ + %D%/packages/patches/nvi-db4.patch \ + %D%/packages/patches/ocaml-CVE-2015-8869.patch \ + %D%/packages/patches/ocaml-findlib-make-install.patch \ + %D%/packages/patches/openexr-missing-samples.patch \ + %D%/packages/patches/openimageio-boost-1.60.patch \ + %D%/packages/patches/openjpeg-CVE-2015-6581.patch \ + %D%/packages/patches/openjpeg-use-after-free-fix.patch \ + %D%/packages/patches/openssh-CVE-2015-8325.patch \ + %D%/packages/patches/openssl-runpath.patch \ + %D%/packages/patches/openssl-c-rehash-in.patch \ + %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ + %D%/packages/patches/ots-no-include-missing-file.patch \ + %D%/packages/patches/patchelf-page-size.patch \ + %D%/packages/patches/patchelf-rework-for-arm.patch \ + %D%/packages/patches/patchutils-xfail-gendiff-tests.patch \ + %D%/packages/patches/patch-hurd-path-max.patch \ + %D%/packages/patches/pcre-CVE-2016-3191.patch \ + %D%/packages/patches/perl-CVE-2015-8607.patch \ + %D%/packages/patches/perl-CVE-2016-2381.patch \ + %D%/packages/patches/perl-autosplit-default-time.patch \ + %D%/packages/patches/perl-deterministic-ordering.patch \ + %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \ + %D%/packages/patches/perl-gd-options-passthrough-and-fontconfig.patch \ + %D%/packages/patches/perl-io-socket-ssl-openssl-1.0.2f-fix.patch \ + %D%/packages/patches/perl-net-amazon-s3-moose-warning.patch \ + %D%/packages/patches/perl-net-ssleay-disable-ede-test.patch \ + %D%/packages/patches/perl-no-build-time.patch \ + %D%/packages/patches/perl-no-sys-dirs.patch \ + %D%/packages/patches/perl-module-pluggable-search.patch \ + %D%/packages/patches/perl-source-date-epoch.patch \ + %D%/packages/patches/pidgin-add-search-path.patch \ + %D%/packages/patches/pinball-const-fix.patch \ + %D%/packages/patches/pinball-cstddef.patch \ + %D%/packages/patches/pinball-missing-separators.patch \ + %D%/packages/patches/pinball-src-deps.patch \ + %D%/packages/patches/pinball-system-ltdl.patch \ + %D%/packages/patches/pingus-sdl-libs-config.patch \ + %D%/packages/patches/plink-1.07-unclobber-i.patch \ + %D%/packages/patches/plotutils-libpng-jmpbuf.patch \ + %D%/packages/patches/polkit-drop-test.patch \ + %D%/packages/patches/portaudio-audacity-compat.patch \ + %D%/packages/patches/portmidi-modular-build.patch \ + %D%/packages/patches/procmail-ambiguous-getline-debian.patch \ + %D%/packages/patches/pt-scotch-build-parallelism.patch \ + %D%/packages/patches/pulseaudio-fix-mult-test.patch \ + %D%/packages/patches/pulseaudio-longer-test-timeout.patch \ + %D%/packages/patches/pycairo-wscript.patch \ + %D%/packages/patches/pybugz-encode-error.patch \ + %D%/packages/patches/pybugz-stty.patch \ + %D%/packages/patches/pygpgme-disable-problematic-tests.patch \ + %D%/packages/patches/pyqt-configure.patch \ + %D%/packages/patches/python-2-deterministic-build-info.patch \ + %D%/packages/patches/python-2.7-search-paths.patch \ + %D%/packages/patches/python-2.7-source-date-epoch.patch \ + %D%/packages/patches/python-3-deterministic-build-info.patch \ + %D%/packages/patches/python-3-search-paths.patch \ + %D%/packages/patches/python-disable-ssl-test.patch \ + %D%/packages/patches/python-fix-tests.patch \ + %D%/packages/patches/python-ipython-inputhook-ctype.patch \ + %D%/packages/patches/python-rarfile-fix-tests.patch \ + %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ + %D%/packages/patches/python-configobj-setuptools.patch \ + %D%/packages/patches/python-paste-remove-website-test.patch \ + %D%/packages/patches/python-paste-remove-timing-test.patch \ + %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ + %D%/packages/patches/qt4-ldflags.patch \ + %D%/packages/patches/ratpoison-shell.patch \ + %D%/packages/patches/readline-link-ncurses.patch \ + %D%/packages/patches/ripperx-missing-file.patch \ + %D%/packages/patches/rsem-makefile.patch \ + %D%/packages/patches/ruby-symlinkfix.patch \ + %D%/packages/patches/sed-hurd-path-max.patch \ + %D%/packages/patches/scheme48-tests.patch \ + %D%/packages/patches/scotch-test-threading.patch \ + %D%/packages/patches/sdl-libx11-1.6.patch \ + %D%/packages/patches/serf-comment-style-fix.patch \ + %D%/packages/patches/serf-deflate-buckets-test-fix.patch \ + %D%/packages/patches/slim-session.patch \ + %D%/packages/patches/slim-config.patch \ + %D%/packages/patches/slim-sigusr1.patch \ + %D%/packages/patches/slurm-configure-remove-nonfree-contribs.patch \ + %D%/packages/patches/soprano-find-clucene.patch \ + %D%/packages/patches/sudo-CVE-2015-5602.patch \ + %D%/packages/patches/superlu-dist-scotchmetis.patch \ + %D%/packages/patches/synfig-build-fix.patch \ + %D%/packages/patches/tar-d_ino_in_dirent-fix.patch \ + %D%/packages/patches/tar-skip-unreliable-tests.patch \ + %D%/packages/patches/tcl-mkindex-deterministic.patch \ + %D%/packages/patches/tclxml-3.2-install.patch \ + %D%/packages/patches/tcsh-fix-autotest.patch \ + %D%/packages/patches/texi2html-document-encoding.patch \ + %D%/packages/patches/texi2html-i18n.patch \ + %D%/packages/patches/tidy-CVE-2015-5522+5523.patch \ + %D%/packages/patches/tinyxml-use-stl.patch \ + %D%/packages/patches/tk-find-library.patch \ + %D%/packages/patches/ttf2eot-cstddef.patch \ + %D%/packages/patches/ttfautohint-source-date-epoch.patch \ + %D%/packages/patches/tophat-build-with-later-seqan.patch \ + %D%/packages/patches/torsocks-dns-test.patch \ + %D%/packages/patches/totem-debug-format-fix.patch \ + %D%/packages/patches/unzip-CVE-2014-8139.patch \ + %D%/packages/patches/unzip-CVE-2014-8140.patch \ + %D%/packages/patches/unzip-CVE-2014-8141.patch \ + %D%/packages/patches/unzip-CVE-2014-9636.patch \ + %D%/packages/patches/unzip-CVE-2015-7696.patch \ + %D%/packages/patches/unzip-CVE-2015-7697.patch \ + %D%/packages/patches/unzip-allow-greater-hostver-values.patch \ + %D%/packages/patches/unzip-attribs-overflow.patch \ + %D%/packages/patches/unzip-overflow-on-invalid-input.patch \ + %D%/packages/patches/unzip-format-secure.patch \ + %D%/packages/patches/unzip-initialize-symlink-flag.patch \ + %D%/packages/patches/unzip-overflow-long-fsize.patch \ + %D%/packages/patches/unzip-remove-build-date.patch \ + %D%/packages/patches/util-linux-tests.patch \ + %D%/packages/patches/upower-builddir.patch \ + %D%/packages/patches/valgrind-enable-arm.patch \ + %D%/packages/patches/vorbis-tools-CVE-2015-6749.patch \ + %D%/packages/patches/vpnc-script.patch \ + %D%/packages/patches/vtk-mesa-10.patch \ + %D%/packages/patches/w3m-libgc.patch \ + %D%/packages/patches/w3m-force-ssl_verify_server-on.patch \ + %D%/packages/patches/w3m-disable-sslv2-and-sslv3.patch \ + %D%/packages/patches/w3m-disable-weak-ciphers.patch \ + %D%/packages/patches/weechat-python.patch \ + %D%/packages/patches/weex-vacopy.patch \ + %D%/packages/patches/wicd-bitrate-none-fix.patch \ + %D%/packages/patches/wicd-get-selected-profile-fix.patch \ + %D%/packages/patches/wicd-urwid-1.3.patch \ + %D%/packages/patches/wicd-wpa2-ttls.patch \ + %D%/packages/patches/wmctrl-64-fix.patch \ + %D%/packages/patches/woff2-libbrotli.patch \ + %D%/packages/patches/wpa-supplicant-CVE-2015-5310.patch \ + %D%/packages/patches/wpa-supplicant-CVE-2015-5314.patch \ + %D%/packages/patches/wpa-supplicant-CVE-2015-5315.patch \ + %D%/packages/patches/wpa-supplicant-CVE-2015-5316.patch \ + %D%/packages/patches/wpa-supplicant-CVE-2016-4476.patch \ + %D%/packages/patches/wpa-supplicant-CVE-2016-4477-pt1.patch \ + %D%/packages/patches/wpa-supplicant-CVE-2016-4477-pt2.patch \ + %D%/packages/patches/wpa-supplicant-CVE-2016-4477-pt3.patch \ + %D%/packages/patches/wpa-supplicant-CVE-2016-4477-pt4.patch \ + %D%/packages/patches/xdotool-fix-makefile.patch \ + %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ + %D%/packages/patches/xf86-video-ast-remove-mibstore.patch \ + %D%/packages/patches/xf86-video-geode-glibc-2.20.patch \ + %D%/packages/patches/xf86-video-glint-remove-mibstore.patch \ + %D%/packages/patches/xf86-video-i128-remove-mibstore.patch \ + %D%/packages/patches/xf86-video-intel-compat-api.patch \ + %D%/packages/patches/xf86-video-intel-glibc-2.20.patch \ + %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \ + %D%/packages/patches/xf86-video-nv-remove-mibstore.patch \ + %D%/packages/patches/xf86-video-openchrome-glibc-2.20.patch \ + %D%/packages/patches/xf86-video-tga-remove-mibstore.patch \ + %D%/packages/patches/xfce4-panel-plugins.patch \ + %D%/packages/patches/xfce4-session-fix-xflock4.patch \ + %D%/packages/patches/xfce4-settings-defaults.patch \ + %D%/packages/patches/xmodmap-asprintf.patch \ + %D%/packages/patches/zathura-plugindir-environment-variable.patch MISC_DISTRO_FILES = \ - gnu/packages/ld-wrapper.in + %D%/packages/ld-wrapper.in -bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap +bootstrapdir = $(guilemoduledir)/%D%/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 + %D%/packages/bootstrap/x86_64-linux/bash \ + %D%/packages/bootstrap/x86_64-linux/mkdir \ + %D%/packages/bootstrap/x86_64-linux/tar \ + %D%/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 + %D%/packages/bootstrap/i686-linux/bash \ + %D%/packages/bootstrap/i686-linux/mkdir \ + %D%/packages/bootstrap/i686-linux/tar \ + %D%/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 + %D%/packages/bootstrap/armhf-linux/bash \ + %D%/packages/bootstrap/armhf-linux/mkdir \ + %D%/packages/bootstrap/armhf-linux/tar \ + %D%/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 + %D%/packages/bootstrap/mips64el-linux/bash \ + %D%/packages/bootstrap/mips64el-linux/mkdir \ + %D%/packages/bootstrap/mips64el-linux/tar \ + %D%/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 + %D%/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 + %D%/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 + %D%/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 + %D%/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz # Those files must remain executable, so they remain executable once # imported into the store. @@ -861,19 +861,19 @@ DOWNLOAD_FILE = \ $(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: +%D%/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: +%D%/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: +%D%/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: +%D%/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz: $(AM_V_DL)$(MKDIR_P) `dirname "$@"`; \ $(DOWNLOAD_FILE) "$@" \ "994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b" diff --git a/nix/local.mk b/nix/local.mk index 3c15531..be57894 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -21,7 +21,7 @@ # Integration of the `guix-daemon' code taken from upstream Nix. # -BUILT_SOURCES += nix/libstore/schema.sql.hh +BUILT_SOURCES += %D%/libstore/schema.sql.hh CLEANFILES += $(BUILT_SOURCES) etc/guix-daemon.service etc/guix-daemon.conf noinst_LIBRARIES = libformat.a libutil.a libstore.a @@ -30,80 +30,80 @@ noinst_LIBRARIES = libformat.a libutil.a libstore.a 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 + %D%/boost/format/free_funcs.cc \ + %D%/boost/format/parsing.cc \ + %D%/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 + %D%/boost/throw_exception.hpp \ + %D%/boost/format.hpp \ + %D%/boost/assert.hpp \ + %D%/boost/format/macros_default.hpp \ + %D%/boost/format/format_fwd.hpp \ + %D%/boost/format/format_class.hpp \ + %D%/boost/format/exceptions.hpp \ + %D%/boost/format/group.hpp \ + %D%/boost/format/feed_args.hpp \ + %D%/boost/format/internals_fwd.hpp \ + %D%/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 + %D%/libutil/archive.cc \ + %D%/libutil/affinity.cc \ + %D%/libutil/serialise.cc \ + %D%/libutil/util.cc \ + %D%/libutil/xml-writer.cc \ + %D%/libutil/hash.cc \ + %D%/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 + %D%/libutil/affinity.hh \ + %D%/libutil/hash.hh \ + %D%/libutil/serialise.hh \ + %D%/libutil/xml-writer.hh \ + %D%/libutil/util.hh \ + %D%/libutil/archive.hh \ + %D%/libutil/types.hh \ + %D%/libutil/gcrypt-hash.hh \ + %D%/libutil/md5.h \ + %D%/libutil/sha1.h \ + %D%/libutil/sha256.h \ + %D%/libutil/sha512.h libutil_a_CPPFLAGS = \ -I$(top_builddir)/nix \ - -I$(top_srcdir)/nix/libutil \ + -I$(top_srcdir)/%D%/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 + %D%/libstore/gc.cc \ + %D%/libstore/globals.cc \ + %D%/libstore/misc.cc \ + %D%/libstore/references.cc \ + %D%/libstore/store-api.cc \ + %D%/libstore/optimise-store.cc \ + %D%/libstore/local-store.cc \ + %D%/libstore/build.cc \ + %D%/libstore/pathlocks.cc \ + %D%/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 + %D%/libstore/references.hh \ + %D%/libstore/pathlocks.hh \ + %D%/libstore/globals.hh \ + %D%/libstore/worker-protocol.hh \ + %D%/libstore/derivations.hh \ + %D%/libstore/misc.hh \ + %D%/libstore/local-store.hh \ + %D%/libstore/store-api.hh libstore_a_CPPFLAGS = \ $(libutil_a_CPPFLAGS) \ - -I$(top_srcdir)/nix/libstore \ - -I$(top_builddir)/nix/libstore \ + -I$(top_srcdir)/%D%/libstore \ + -I$(top_builddir)/%D%/libstore \ -DNIX_STORE_DIR=\"$(storedir)\" \ -DNIX_DATA_DIR=\"$(datadir)\" \ -DNIX_STATE_DIR=\"$(localstatedir)/guix\" \ @@ -121,29 +121,29 @@ bin_PROGRAMS = guix-daemon sbin_PROGRAMS = guix-register guix_daemon_SOURCES = \ - nix/nix-daemon/nix-daemon.cc \ - nix/nix-daemon/guix-daemon.cc + %D%/nix-daemon/nix-daemon.cc \ + %D%/nix-daemon/guix-daemon.cc guix_daemon_CPPFLAGS = \ -DLOCALEDIR=\"$(localedir)\" \ $(libutil_a_CPPFLAGS) \ - -I$(top_srcdir)/nix/libstore + -I$(top_srcdir)/%D%/libstore guix_daemon_LDADD = \ libstore.a libutil.a libformat.a -lbz2 \ $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) guix_daemon_headers = \ - nix/nix-daemon/shared.hh + %D%/nix-daemon/shared.hh guix_register_SOURCES = \ - nix/guix-register/guix-register.cc + %D%/guix-register/guix-register.cc guix_register_CPPFLAGS = \ $(libutil_a_CPPFLAGS) \ $(libstore_a_CPPFLAGS) \ - -I$(top_srcdir)/nix/libstore + -I$(top_srcdir)/%D%/libstore # XXX: Should we start using shared libs? guix_register_LDADD = \ @@ -155,7 +155,7 @@ noinst_HEADERS = \ $(libformat_headers) $(libutil_headers) $(libstore_headers) \ $(guix_daemon_headers) -nix/libstore/schema.sql.hh: nix/libstore/schema.sql +%D%/libstore/schema.sql.hh: %D%/libstore/schema.sql $(AM_V_GEN)$(GUILE) --no-auto-compile -c \ "(use-modules (rnrs io ports)) \ (call-with-output-file \"address@hidden" \ @@ -165,20 +165,20 @@ nix/libstore/schema.sql.hh: nix/libstore/schema.sql (write (get-string-all in) out)))))" nodist_pkglibexec_SCRIPTS = \ - nix/scripts/list-runtime-roots \ - nix/scripts/substitute + %D%/scripts/list-runtime-roots \ + %D%/scripts/substitute if BUILD_DAEMON_OFFLOAD nodist_pkglibexec_SCRIPTS += \ - nix/scripts/offload + %D%/scripts/offload endif BUILD_DAEMON_OFFLOAD # XXX: It'd be better to hide it in $(pkglibexecdir). nodist_libexec_SCRIPTS = \ - nix/scripts/guix-authenticate + %D%/scripts/guix-authenticate # The '.service' file for systemd. systemdservicedir = $(libdir)/systemd/system @@ -203,9 +203,9 @@ etc/guix-daemon.conf: etc/guix-daemon.conf.in \ mv "address@hidden" "$@" EXTRA_DIST += \ - nix/libstore/schema.sql \ - nix/AUTHORS \ - nix/COPYING \ + %D%/libstore/schema.sql \ + %D%/AUTHORS \ + %D%/COPYING \ etc/guix-daemon.service.in \ etc/guix-daemon.conf.in -- 2.8.1