Merge remote-tracking branch 'origin/master' into core-updates
[jackhill/guix/guix.git] / gnu / local.mk
index 346c828..2a2def9 100644 (file)
@@ -417,6 +417,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/vim.scm                         \
   %D%/packages/virtualization.scm              \
   %D%/packages/vpn.scm                         \
+  %D%/packages/vulkan.scm                      \
   %D%/packages/w3m.scm                         \
   %D%/packages/wdiff.scm                       \
   %D%/packages/web.scm                         \
@@ -529,6 +530,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/a2ps-CVE-2014-0466.patch        \
   %D%/packages/patches/abiword-explictly-cast-bools.patch      \
   %D%/packages/patches/abiword-black-drawing-with-gtk322.patch \
+  %D%/packages/patches/acl-fix-perl-regex.patch                \
   %D%/packages/patches/acl-hurd-path-max.patch                 \
   %D%/packages/patches/aegis-constness-error.patch             \
   %D%/packages/patches/aegis-perl-tempdir1.patch               \
@@ -545,8 +547,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/ath9k-htc-firmware-objcopy.patch                \
   %D%/packages/patches/audacity-build-with-system-portaudio.patch \
   %D%/packages/patches/automake-skip-amhello-tests.patch       \
-  %D%/packages/patches/automake-regexp-syntax.patch            \
-  %D%/packages/patches/automake-test-gzip-warning.patch                \
   %D%/packages/patches/avahi-localstatedir.patch               \
   %D%/packages/patches/avidemux-install-to-lib.patch           \
   %D%/packages/patches/awesome-reproducible-png.patch          \
@@ -581,7 +581,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/cool-retro-term-fix-array-size.patch    \
   %D%/packages/patches/cool-retro-term-memory-leak-1.patch     \
   %D%/packages/patches/cool-retro-term-remove-non-free-fonts.patch     \
-  %D%/packages/patches/coreutils-cut-huge-range-test.patch     \
   %D%/packages/patches/cpio-CVE-2016-2037.patch                        \
   %D%/packages/patches/cpufrequtils-fix-aclocal.patch          \
   %D%/packages/patches/cracklib-CVE-2016-6318.patch            \
@@ -600,6 +599,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
   %D%/packages/patches/dfu-programmer-fix-libusb.patch         \
   %D%/packages/patches/diffutils-gets-undeclared.patch         \
+  %D%/packages/patches/diffutils-getopt.patch                  \
   %D%/packages/patches/doc++-include-directives.patch          \
   %D%/packages/patches/doc++-segfault-fix.patch                        \
   %D%/packages/patches/doxygen-test.patch                      \
@@ -631,13 +631,13 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/fcgi-2.4.0-poll.patch                   \
   %D%/packages/patches/file-CVE-2017-1000249.patch             \
   %D%/packages/patches/findutils-localstatedir.patch           \
-  %D%/packages/patches/findutils-gnulib-multi-core.patch       \
   %D%/packages/patches/findutils-test-xargs.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/foomatic-filters-CVE-2015-8327.patch    \
   %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch    \
+  %D%/packages/patches/fontconfig-remove-debug-printf.patch    \
   %D%/packages/patches/freeimage-CVE-2015-0852.patch           \
   %D%/packages/patches/freeimage-CVE-2016-5684.patch           \
   %D%/packages/patches/freeimage-fix-build-with-gcc-5.patch    \
@@ -645,8 +645,8 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/gawk-shell.patch                                \
   %D%/packages/patches/gcc-arm-bug-71399.patch                 \
   %D%/packages/patches/gcc-arm-link-spec-fix.patch             \
-  %D%/packages/patches/gcc-asan-powerpc-missing-include.patch  \
   %D%/packages/patches/gcc-cross-environment-variables.patch   \
+  %D%/packages/patches/gcc-fix-texi2pod.patch                  \
   %D%/packages/patches/gcc-libvtv-runpath.patch                        \
   %D%/packages/patches/gcc-strmov-store-file-names.patch       \
   %D%/packages/patches/gcc-4-compile-with-gcc-5.patch           \
@@ -666,15 +666,13 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/gegl-CVE-2012-4433.patch                        \
   %D%/packages/patches/gemma-intel-compat.patch                        \
   %D%/packages/patches/geoclue-config.patch                    \
-  %D%/packages/patches/gettext-multi-core.patch                \
-  %D%/packages/patches/gettext-gnulib-multi-core.patch          \
   %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch     \
-  %D%/packages/patches/ghostscript-CVE-2017-8291.patch         \
   %D%/packages/patches/ghostscript-no-header-id.patch          \
   %D%/packages/patches/ghostscript-no-header-uuid.patch                \
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
   %D%/packages/patches/ghostscript-runpath.patch               \
   %D%/packages/patches/glib-networking-ssl-cert-file.patch     \
+  %D%/packages/patches/glib-respect-datadir.patch              \
   %D%/packages/patches/glib-tests-timer.patch                  \
   %D%/packages/patches/glibc-CVE-2015-5180.patch               \
   %D%/packages/patches/glibc-CVE-2015-7547.patch               \
@@ -704,7 +702,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/gobject-introspection-cc.patch          \
   %D%/packages/patches/gobject-introspection-girepository.patch        \
   %D%/packages/patches/graphite2-ffloat-store.patch            \
-  %D%/packages/patches/grep-gnulib-lock.patch                   \
   %D%/packages/patches/grep-timing-sensitive-test.patch                \
   %D%/packages/patches/groff-source-date-epoch.patch           \
   %D%/packages/patches/gsl-test-i686.patch                     \
@@ -721,6 +718,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch       \
   %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
   %D%/packages/patches/gtk2-theme-paths.patch                  \
+  %D%/packages/patches/gtk2-fix-failing-test.patch             \
   %D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch       \
   %D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
   %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
@@ -749,9 +747,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/icecat-bug-1415133.patch                        \
   %D%/packages/patches/icecat-bug-1414945.patch                        \
   %D%/packages/patches/icecat-bug-1424373-pt2.patch            \
-  %D%/packages/patches/icu4c-CVE-2017-7867-CVE-2017-7868.patch \
-  %D%/packages/patches/icu4c-CVE-2017-14952.patch              \
-  %D%/packages/patches/icu4c-reset-keyword-list-iterator.patch \
   %D%/packages/patches/id3lib-CVE-2007-4460.patch                      \
   %D%/packages/patches/ilmbase-fix-tests.patch                 \
   %D%/packages/patches/intltool-perl-compatibility.patch       \
@@ -760,10 +755,6 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/java-powermock-fix-java-files.patch             \
   %D%/packages/patches/jemalloc-arm-address-bits.patch         \
   %D%/packages/patches/jbig2dec-ignore-testtest.patch          \
-  %D%/packages/patches/jbig2dec-CVE-2016-9601.patch            \
-  %D%/packages/patches/jbig2dec-CVE-2017-7885.patch            \
-  %D%/packages/patches/jbig2dec-CVE-2017-7975.patch            \
-  %D%/packages/patches/jbig2dec-CVE-2017-7976.patch            \
   %D%/packages/patches/jq-CVE-2015-8863.patch                  \
   %D%/packages/patches/kdbusaddons-kinit-file-name.patch       \
   %D%/packages/patches/khmer-use-libraries.patch                \
@@ -828,29 +819,14 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/libtar-CVE-2013-4420.patch              \
   %D%/packages/patches/libtasn1-CVE-2017-10790.patch           \
   %D%/packages/patches/libtheora-config-guess.patch            \
-  %D%/packages/patches/libtiff-CVE-2016-10688.patch            \
-  %D%/packages/patches/libtiff-CVE-2017-9936.patch             \
-  %D%/packages/patches/libtiff-tiffgetfield-bugs.patch         \
-  %D%/packages/patches/libtiff-tiffycbcrtorgb-integer-overflow.patch   \
-  %D%/packages/patches/libtiff-tiffycbcrtorgbinit-integer-overflow.patch       \
   %D%/packages/patches/libtirpc-CVE-2017-8779.patch            \
   %D%/packages/patches/libtool-skip-tests2.patch               \
-  %D%/packages/patches/libunistring-gnulib-multi-core.patch    \
   %D%/packages/patches/libusb-0.1-disable-tests.patch          \
   %D%/packages/patches/libusb-for-axoloti.patch                        \
   %D%/packages/patches/libvdpau-va-gl-unbundle.patch           \
   %D%/packages/patches/libvpx-CVE-2016-2818.patch              \
   %D%/packages/patches/libxcb-python-3.5-compat.patch          \
-  %D%/packages/patches/libxml2-CVE-2016-4658.patch             \
-  %D%/packages/patches/libxml2-CVE-2016-5131.patch             \
-  %D%/packages/patches/libxml2-CVE-2017-0663.patch             \
-  %D%/packages/patches/libxml2-CVE-2017-7375.patch             \
-  %D%/packages/patches/libxml2-CVE-2017-7376.patch             \
-  %D%/packages/patches/libxml2-CVE-2017-9047+CVE-2017-9048.patch       \
-  %D%/packages/patches/libxml2-CVE-2017-9049+CVE-2017-9050.patch       \
   %D%/packages/patches/libxslt-generated-ids.patch             \
-  %D%/packages/patches/libxslt-CVE-2016-4738.patch             \
-  %D%/packages/patches/libxslt-CVE-2017-5029.patch             \
   %D%/packages/patches/libxt-guix-search-paths.patch           \
   %D%/packages/patches/lierolibre-check-unaligned-access.patch \
   %D%/packages/patches/lierolibre-is-free-software.patch       \
@@ -902,7 +878,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/mupdf-build-with-latest-openjpeg.patch  \
   %D%/packages/patches/mupen64plus-ui-console-notice.patch     \
   %D%/packages/patches/mutt-store-references.patch             \
-  %D%/packages/patches/ncurses-CVE-2017-10684-10685.patch      \
   %D%/packages/patches/net-tools-bitrot.patch                  \
   %D%/packages/patches/netcdf-date-time.patch                  \
   %D%/packages/patches/netcdf-tst_h_par.patch                  \
@@ -913,7 +888,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/newsbeuter-CVE-2017-14500.patch         \
   %D%/packages/patches/ngircd-handle-zombies.patch             \
   %D%/packages/patches/ninja-zero-mtime.patch                  \
-  %D%/packages/patches/node-test-http2-server-rst-stream.patch \
   %D%/packages/patches/nss-increase-test-timeout.patch         \
   %D%/packages/patches/nss-pkgconfig.patch                     \
   %D%/packages/patches/nvi-assume-preserve-path.patch          \
@@ -947,7 +921,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/patchutils-xfail-gendiff-tests.patch    \
   %D%/packages/patches/patch-hurd-path-max.patch               \
   %D%/packages/patches/pcmanfm-CVE-2017-8934.patch             \
-  %D%/packages/patches/pcre-CVE-2017-7186.patch                        \
   %D%/packages/patches/pcre2-CVE-2017-7186.patch               \
   %D%/packages/patches/pcre2-CVE-2017-8786.patch               \
   %D%/packages/patches/perl-file-path-CVE-2017-6512.patch      \
@@ -995,14 +968,13 @@ dist_patch_DATA =                                         \
   %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-getentropy-on-old-kernels.patch      \
+  %D%/packages/patches/python-2.7-adjust-tests.patch           \
   %D%/packages/patches/python-2.7-search-paths.patch           \
   %D%/packages/patches/python-2.7-site-prefixes.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-3.5-fix-tests.patch              \
-  %D%/packages/patches/python-3.5-getentropy-on-old-kernels.patch      \
+  %D%/packages/patches/python-3-fix-tests.patch                        \
   %D%/packages/patches/python-dendropy-fix-tests.patch         \
   %D%/packages/patches/python-fix-tests.patch                  \
   %D%/packages/patches/python-genshi-add-support-for-python-3.4-AST.patch      \
@@ -1029,7 +1001,8 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
   %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
   %D%/packages/patches/python2-subprocess32-disable-input-test.patch   \
-  %D%/packages/patches/python2-unittest2-remove-argparse.patch \
+  %D%/packages/patches/python-unittest2-python3-compat.patch   \
+  %D%/packages/patches/python-unittest2-remove-argparse.patch  \
   %D%/packages/patches/qemu-CVE-2017-15038.patch               \
   %D%/packages/patches/qemu-CVE-2017-15289.patch               \
   %D%/packages/patches/qt4-ldflags.patch                       \
@@ -1081,7 +1054,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/t1lib-CVE-2011-1552+.patch              \
   %D%/packages/patches/tar-CVE-2016-6321.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/tcsh-fix-out-of-bounds-read.patch       \
@@ -1118,6 +1090,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/util-linux-tests.patch                  \
   %D%/packages/patches/upower-builddir.patch                   \
   %D%/packages/patches/valgrind-enable-arm.patch               \
+  %D%/packages/patches/valgrind-glibc-compat.patch             \
   %D%/packages/patches/vinagre-revert-1.patch                   \
   %D%/packages/patches/vinagre-revert-2.patch                   \
   %D%/packages/patches/virglrenderer-CVE-2017-6386.patch       \
@@ -1209,56 +1182,7 @@ dist_bootstrap_mips64el_linux_DATA =             \
   %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 =                                   \
-  %D%/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz
-nodist_bootstrap_i686_linux_DATA =                                     \
-  %D%/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz
-nodist_bootstrap_armhf_linux_DATA =                                    \
-  %D%/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz
-nodist_bootstrap_aarch64_linux_DATA =                                  \
-  %D%/packages/bootstrap/aarch64-linux/guile-2.0.14.tar.xz
-nodist_bootstrap_mips64el_linux_DATA =                                 \
-  %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.
 set-bootstrap-executable-permissions:
        chmod +x $(DESTDIR)$(bootstrapdir)/*/{bash,mkdir,tar,xz}
-
-BOOTSTRAP_GUILE_TARBALLS =                     \
-  $(nodist_bootstrap_x86_64_linux_DATA)                \
-  $(nodist_bootstrap_i686_linux_DATA)          \
-  $(nodist_bootstrap_armhf_linux_DATA)         \
-  $(nodist_bootstrap_aarch64_linux_DATA)       \
-  $(nodist_bootstrap_mips64el_linux_DATA)
-
-DISTCLEANFILES = $(BOOTSTRAP_GUILE_TARBALLS)
-
-# 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"
-
-%D%/packages/bootstrap/x86_64-linux/guile-2.0.9.tar.xz:
-       $(AM_V_DL)$(MKDIR_P) `dirname "$@"`;    \
-       $(DOWNLOAD_FILE) "$@"                   \
-         "037b103522a2d0d7d69c7ffd8de683dfe5bb4b59c1fafd70b4ffd397fd2f57f0"
-%D%/packages/bootstrap/i686-linux/guile-2.0.9.tar.xz:
-       $(AM_V_DL)$(MKDIR_P) `dirname "$@"`;    \
-       $(DOWNLOAD_FILE) "$@"                   \
-         "b757cd46bf13ecac83fb8e955fb50096ac2d17bb610ca8eb816f29302a00a846"
-%D%/packages/bootstrap/armhf-linux/guile-2.0.11.tar.xz:
-       $(AM_V_DL)$(MKDIR_P) `dirname "$@"`;    \
-       $(DOWNLOAD_FILE) "$@"                   \
-         "e551d05d4d385d6706ab8d574856a087758294dc90ab4c06e70a157a685e23d6"
-%D%/packages/bootstrap/aarch64-linux/guile-2.0.14.tar.xz:
-       $(AM_V_DL)$(MKDIR_P) `dirname "$@"`;    \
-       $(DOWNLOAD_FILE) "$@"                   \
-         "3939909f24dcb955621aa7f81ecde6844bea8a083969c2d275c55699af123ebe"
-%D%/packages/bootstrap/mips64el-linux/guile-2.0.9.tar.xz:
-       $(AM_V_DL)$(MKDIR_P) `dirname "$@"`;    \
-       $(DOWNLOAD_FILE) "$@"                   \
-         "994680f0001346864aa2c2cc5110f380ee7518dcd701c614291682b8e948f73b"