Merge branch 'master' into staging
[jackhill/guix/guix.git] / gnu / local.mk
index 4795e85..ee8b13d 100644 (file)
@@ -1,13 +1,13 @@
 # GNU Guix --- Functional package management for GNU
 # Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Andreas Enge <andreas@enge.fr>
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Andreas Enge <andreas@enge.fr>
 # Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Mark H Weaver <mhw@netris.org>
 # Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
 # Copyright © 2016, 2017, 2018 Kei Kebreau <kkebreau@posteo.net>
 # Copyright © 2016, 2017 Rene Saavedra <rennes@openmailbox.org>
 # Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
-# Copyright © 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
+# Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
 # Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 # Copyright © 2016, 2017, 2018, 2019 Alex Vong <alexvong1995@gmail.com>
 # Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
@@ -220,6 +220,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/gtk.scm                         \
   %D%/packages/guile.scm                       \
   %D%/packages/guile-wm.scm                    \
+  %D%/packages/guile-xyz.scm                   \
   %D%/packages/gv.scm                          \
   %D%/packages/gxmessage.scm                   \
   %D%/packages/hardware.scm                    \
@@ -371,6 +372,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/pure.scm                                \
   %D%/packages/pv.scm                          \
   %D%/packages/python.scm                      \
+  %D%/packages/python-check.scm                        \
   %D%/packages/python-compression.scm          \
   %D%/packages/python-crypto.scm               \
   %D%/packages/python-web.scm                  \
@@ -393,6 +395,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/rush.scm                                \
   %D%/packages/rust.scm                                \
   %D%/packages/samba.scm                       \
+  %D%/packages/sagemath.scm                    \
   %D%/packages/sawfish.scm                     \
   %D%/packages/scanner.scm                     \
   %D%/packages/scheme.scm                      \
@@ -594,6 +597,7 @@ GNU_SYSTEM_MODULES +=                           \
   %D%/installer/newt/partition.scm             \
   %D%/installer/newt/services.scm              \
   %D%/installer/newt/timezone.scm              \
+  %D%/installer/newt/user.scm                  \
   %D%/installer/newt/utils.scm                 \
   %D%/installer/newt/welcome.scm               \
   %D%/installer/newt/wifi.scm  
@@ -629,7 +633,8 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/aegisub-icu59-include-unistr.patch      \
   %D%/packages/patches/aegisub-boost68.patch                    \
   %D%/packages/patches/agg-am_c_prototype.patch                        \
-  %D%/packages/patches/allegro-fix-compilation-mesa-18.2.5-and-later.patch \
+  %D%/packages/patches/allegro-mesa-18.2.5-and-later.patch     \
+  %D%/packages/patches/allegro4-mesa-18.2.5-and-later.patch    \
   %D%/packages/patches/amule-crypto-6.patch                    \
   %D%/packages/patches/antiword-CVE-2014-8123.patch                    \
   %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch  \
@@ -661,8 +666,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/blender-newer-ffmpeg.patch              \
   %D%/packages/patches/boost-fix-icu-build.patch               \
   %D%/packages/patches/byobu-writable-status.patch             \
-  %D%/packages/patches/cairo-CVE-2016-9082.patch                       \
-  %D%/packages/patches/cairo-setjmp-wrapper.patch              \
   %D%/packages/patches/calibre-no-updates-dialog.patch         \
   %D%/packages/patches/calibre-use-packaged-feedparser.patch   \
   %D%/packages/patches/casync-renameat2-declaration.patch      \
@@ -691,6 +694,8 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/clucene-pkgconfig.patch                 \
   %D%/packages/patches/clx-remove-demo.patch                   \
   %D%/packages/patches/coda-use-system-libs.patch              \
+  %D%/packages/patches/combinatorial-blas-awpm.patch           \
+  %D%/packages/patches/combinatorial-blas-io-fix.patch         \
   %D%/packages/patches/cool-retro-term-dont-check-uninit-member.patch  \
   %D%/packages/patches/cool-retro-term-fix-array-size.patch    \
   %D%/packages/patches/cool-retro-term-memory-leak-1.patch     \
@@ -704,7 +709,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/cube-nocheck.patch                      \
   %D%/packages/patches/cursynth-wave-rand.patch                        \
   %D%/packages/patches/cvs-2017-12836.patch                    \
-  %D%/packages/patches/cyrus-sasl-CVE-2013-4122.patch          \
   %D%/packages/patches/dbus-helper-search-path.patch           \
   %D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
   %D%/packages/patches/dfu-programmer-fix-libusb.patch         \
@@ -719,6 +723,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/doxygen-test.patch                      \
   %D%/packages/patches/dropbear-CVE-2018-15599.patch           \
   %D%/packages/patches/dvd+rw-tools-add-include.patch          \
+  %D%/packages/patches/efl-mesa-compat.patch                   \
   %D%/packages/patches/elfutils-tests-ptrace.patch             \
   %D%/packages/patches/einstein-build.patch                    \
   %D%/packages/patches/emacs-exec-path.patch                   \
@@ -744,6 +749,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/fasthenry-spUtils.patch                 \
   %D%/packages/patches/fasthenry-spSolve.patch                 \
   %D%/packages/patches/fasthenry-spFactor.patch                        \
+  %D%/packages/patches/fbreader-curl-7.62.patch                \
   %D%/packages/patches/fcgi-2.4.0-gcc44-fixes.patch            \
   %D%/packages/patches/fcgi-2.4.0-poll.patch                   \
   %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch                \
@@ -796,14 +802,12 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \
   %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch     \
   %D%/packages/patches/ghc-haddock-library-unbundle.patch              \
-  %D%/packages/patches/ghostscript-CVE-2018-16509.patch                \
-  %D%/packages/patches/ghostscript-bug-699708.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/giflib-make-reallocarray-private.patch  \
-  %D%/packages/patches/glib-networking-ssl-cert-file.patch     \
   %D%/packages/patches/glib-tests-timer.patch                  \
+  %D%/packages/patches/glib-networking-connection.patch        \
   %D%/packages/patches/glibc-CVE-2015-5180.patch               \
   %D%/packages/patches/glibc-CVE-2015-7547.patch               \
   %D%/packages/patches/glibc-CVE-2016-3075.patch               \
@@ -833,7 +837,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/gnome-tweak-tool-search-paths.patch     \
   %D%/packages/patches/gnucash-fix-test-transaction-failure.patch \
   %D%/packages/patches/gnutls-skip-trust-store-test.patch      \
-  %D%/packages/patches/gnutls-skip-pkgconfig-test.patch                \
   %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
   %D%/packages/patches/gobject-introspection-cc.patch          \
   %D%/packages/patches/gobject-introspection-girepository.patch        \
@@ -881,6 +884,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch        \
   %D%/packages/patches/hplip-remove-imageprocessor.patch       \
   %D%/packages/patches/hydra-disable-darcs-test.patch          \
+  %D%/packages/patches/icecat-makeicecat.patch                 \
   %D%/packages/patches/icecat-avoid-bundled-libraries.patch    \
   %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch      \
   %D%/packages/patches/icecat-use-system-media-libs.patch      \
@@ -888,6 +892,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch  \
   %D%/packages/patches/id3lib-CVE-2007-4460.patch                      \
   %D%/packages/patches/ilmbase-fix-tests.patch                 \
+  %D%/packages/patches/inkscape-poppler-compat3.patch          \
   %D%/packages/patches/intltool-perl-compatibility.patch       \
   %D%/packages/patches/irrlicht-use-system-libs.patch          \
   %D%/packages/patches/isl-0.11.1-aarch64-support.patch        \
@@ -902,7 +907,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/java-xerces-build_dont_unzip.patch      \
   %D%/packages/patches/java-xerces-xjavac_taskdef.patch        \
   %D%/packages/patches/jbig2dec-ignore-testtest.patch          \
-  %D%/packages/patches/json-glib-fix-tests-32bit.patch         \
   %D%/packages/patches/kdbusaddons-kinit-file-name.patch       \
   %D%/packages/patches/khmer-use-libraries.patch                \
   %D%/packages/patches/libziparchive-add-includes.patch                \
@@ -982,10 +986,6 @@ dist_patch_DATA =                                          \
   %D%/packages/patches/libssh2-fix-build-failure-with-gcrypt.patch     \
   %D%/packages/patches/libtar-CVE-2013-4420.patch              \
   %D%/packages/patches/libtheora-config-guess.patch            \
-  %D%/packages/patches/libtiff-CVE-2017-9935.patch             \
-  %D%/packages/patches/libtiff-CVE-2017-18013.patch            \
-  %D%/packages/patches/libtiff-CVE-2018-8905.patch             \
-  %D%/packages/patches/libtiff-CVE-2018-10963.patch            \
   %D%/packages/patches/libtool-skip-tests2.patch               \
   %D%/packages/patches/libusb-0.1-disable-tests.patch          \
   %D%/packages/patches/libusb-for-axoloti.patch                        \
@@ -1001,6 +1001,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/lierolibre-newer-libconfig.patch                \
   %D%/packages/patches/lierolibre-remove-arch-warning.patch    \
   %D%/packages/patches/lierolibre-try-building-other-arch.patch        \
+  %D%/packages/patches/linkchecker-mark-more-tests-that-require-the-network.patch      \
   %D%/packages/patches/linux-pam-no-setfsuid.patch             \
   %D%/packages/patches/lirc-localstatedir.patch                        \
   %D%/packages/patches/lirc-reproducible-build.patch           \
@@ -1096,6 +1097,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/osip-CVE-2017-7853.patch                        \
   %D%/packages/patches/ots-no-include-missing-file.patch       \
   %D%/packages/patches/owncloud-disable-updatecheck.patch      \
+  %D%/packages/patches/p11-kit-jks-timestamps.patch            \
   %D%/packages/patches/p7zip-CVE-2016-9296.patch               \
   %D%/packages/patches/p7zip-CVE-2017-17969.patch              \
   %D%/packages/patches/p7zip-remove-unused-code.patch          \
@@ -1123,6 +1125,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/pinball-src-deps.patch                  \
   %D%/packages/patches/pinball-system-ltdl.patch               \
   %D%/packages/patches/pinentry-efl.patch                      \
+  %D%/packages/patches/pingus-boost-headers.patch              \
   %D%/packages/patches/pingus-sdl-libs-config.patch            \
   %D%/packages/patches/pius.patch                              \
   %D%/packages/patches/pixman-CVE-2016-5296.patch              \
@@ -1131,9 +1134,9 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/plotutils-libpng-jmpbuf.patch           \
   %D%/packages/patches/podofo-cmake-3.12.patch                 \
   %D%/packages/patches/polkit-CVE-2018-19788.patch             \
-  %D%/packages/patches/poppler-CVE-2018-19149.patch            \
   %D%/packages/patches/portaudio-audacity-compat.patch         \
   %D%/packages/patches/portmidi-modular-build.patch            \
+  %D%/packages/patches/postgresql-disable-resolve_symlinks.patch       \
   %D%/packages/patches/potrace-tests.patch                     \
   %D%/packages/patches/procmail-ambiguous-getline-debian.patch  \
   %D%/packages/patches/procmail-CVE-2014-3618.patch            \
@@ -1179,10 +1182,11 @@ dist_patch_DATA =                                               \
   %D%/packages/patches/python-unittest2-remove-argparse.patch  \
   %D%/packages/patches/python-waitress-fix-tests.patch         \
   %D%/packages/patches/qemu-glibc-2.27.patch                   \
+  %D%/packages/patches/qemu-CVE-2018-16872.patch               \
+  %D%/packages/patches/qemu-CVE-2019-6778.patch                \
   %D%/packages/patches/qt4-ldflags.patch                       \
   %D%/packages/patches/qtbase-use-TZDIR.patch                  \
   %D%/packages/patches/qtscript-disable-tests.patch            \
-  %D%/packages/patches/qt-5-renameat2.patch                    \
   %D%/packages/patches/quagga-reproducible-build.patch          \
   %D%/packages/patches/quickswitch-fix-dmenu-check.patch       \
   %D%/packages/patches/quilt-test-fix-regex.patch              \
@@ -1216,10 +1220,8 @@ dist_patch_DATA =                                                \
   %D%/packages/patches/rust-reproducible-builds.patch           \
   %D%/packages/patches/rxvt-unicode-escape-sequences.patch     \
   %D%/packages/patches/scheme48-tests.patch                    \
-  %D%/packages/patches/scotch-test-threading.patch             \
   %D%/packages/patches/scotch-build-parallelism.patch          \
-  %D%/packages/patches/scotch-graph-diam-64.patch              \
-  %D%/packages/patches/scotch-graph-induce-type-64.patch       \
+  %D%/packages/patches/scotch-integer-declarations.patch       \
   %D%/packages/patches/scribus-poppler.patch                   \
   %D%/packages/patches/sdl-libx11-1.6.patch                    \
   %D%/packages/patches/seq24-rename-mutex.patch                        \
@@ -1235,8 +1237,10 @@ dist_patch_DATA =                                                \
   %D%/packages/patches/soundconverter-remove-gconf-dependency.patch    \
   %D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch   \
   %D%/packages/patches/soundtouch-CVE-2018-1000223.patch       \
+  %D%/packages/patches/sssd-curl-compat.patch                  \
   %D%/packages/patches/steghide-fixes.patch                    \
   %D%/packages/patches/streamlink-update-test.patch            \
+  %D%/packages/patches/superlu-dist-awpm-grid.patch            \
   %D%/packages/patches/superlu-dist-scotchmetis.patch          \
   %D%/packages/patches/swig-guile-gc.patch                     \
   %D%/packages/patches/swish-e-search.patch                    \
@@ -1255,6 +1259,9 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/teeworlds-use-latest-wavpack.patch      \
   %D%/packages/patches/texinfo-perl-compat.patch               \
   %D%/packages/patches/texinfo-5-perl-compat.patch             \
+  %D%/packages/patches/texlive-bin-luatex-poppler-compat.patch \
+  %D%/packages/patches/texlive-bin-pdftex-poppler-compat.patch \
+  %D%/packages/patches/texlive-bin-xetex-poppler-compat.patch  \
   %D%/packages/patches/telegram-purple-adjust-test.patch       \
   %D%/packages/patches/texi2html-document-encoding.patch       \
   %D%/packages/patches/texi2html-i18n.patch                    \
@@ -1311,6 +1318,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/wavpack-CVE-2018-7253.patch             \
   %D%/packages/patches/wavpack-CVE-2018-7254.patch             \
   %D%/packages/patches/weechat-python.patch                    \
+  %D%/packages/patches/wesnoth-newer-boost.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                    \
@@ -1328,7 +1336,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/wpa-supplicant-fix-nonce-reuse.patch    \
   %D%/packages/patches/wpa-supplicant-krack-followups.patch    \
   %D%/packages/patches/x265-arm-flags.patch                    \
-  %D%/packages/patches/x265-detect512-all-arches.patch         \
   %D%/packages/patches/xboing-CVE-2004-0149.patch              \
   %D%/packages/patches/xf86-video-ark-remove-mibstore.patch    \
   %D%/packages/patches/xf86-video-geode-glibc-2.20.patch       \
@@ -1343,8 +1350,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/xfce4-settings-defaults.patch           \
   %D%/packages/patches/xinetd-fix-fd-leak.patch                        \
   %D%/packages/patches/xinetd-CVE-2013-4342.patch              \
-  %D%/packages/patches/xmodmap-asprintf.patch                  \
-  %D%/packages/patches/zathura-plugindir-environment-variable.patch
+  %D%/packages/patches/xmodmap-asprintf.patch
 
 MISC_DISTRO_FILES =                            \
   %D%/packages/ld-wrapper.in