Merge branch 'master' into staging
[jackhill/guix/guix.git] / gnu / local.mk
index f339f32..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                    \
@@ -394,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                      \
@@ -595,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  
@@ -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     \
@@ -879,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      \
@@ -995,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           \
@@ -1090,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          \
@@ -1174,6 +1182,8 @@ 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            \
@@ -1210,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                        \
@@ -1232,6 +1240,7 @@ dist_patch_DATA =                                         \
   %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                    \
@@ -1327,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       \