Merge branch 'master' into core-updates

[jackhill/guix/guix.git] / gnu / local.mk

diff --git a/gnu/local.mk b/gnu/local.mk
index 7c3e264..cc219b4 100644 (file)
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -656,6 +656,7 @@ INSTALLER_MODULES =                             \
   %D%/installer/record.scm                     \
   %D%/installer/services.scm                   \
   %D%/installer/steps.scm                      \
+  %D%/installer/tests.scm                      \
   %D%/installer/timezone.scm                   \
   %D%/installer/user.scm                       \
   %D%/installer/utils.scm                      \
@@ -713,10 +714,11 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/aegisub-boost68.patch                    \
   %D%/packages/patches/agg-am_c_prototype.patch                        \
   %D%/packages/patches/akonadi-paths.patch             \
-  %D%/packages/patches/akonadi-Revert-Make-installation-properly-relocatabl.patch \
+  %D%/packages/patches/akonadi-Revert-Make-installation-properly-relo.patch \
   %D%/packages/patches/akonadi-timestamps.patch                \
   %D%/packages/patches/allegro-mesa-18.2.5-and-later.patch     \
   %D%/packages/patches/amule-crypto-6.patch                    \
+  %D%/packages/patches/anki-mpv-args.patch                     \
   %D%/packages/patches/antiword-CVE-2014-8123.patch                    \
   %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch  \
   %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch  \
@@ -801,7 +803,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/cpufrequtils-fix-aclocal.patch          \
   %D%/packages/patches/crawl-upgrade-saves.patch               \
   %D%/packages/patches/crda-optional-gcrypt.patch              \
-  %D%/packages/patches/csvkit-fix-tests.patch                  \
   %D%/packages/patches/clucene-contribs-lib.patch               \
   %D%/packages/patches/cube-nocheck.patch                      \
   %D%/packages/patches/curl-use-ssl-cert-env.patch             \
@@ -988,6 +989,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/guile-1.8-cpp-4.5.patch                 \
   %D%/packages/patches/guile-2.2-default-utf8.patch            \
   %D%/packages/patches/guile-2.2-skip-oom-test.patch            \
+  %D%/packages/patches/guile-3.0-crash.patch                   \
   %D%/packages/patches/guile-default-utf8.patch                        \
   %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch  \
   %D%/packages/patches/guile-finalization-crash.patch          \
@@ -1123,7 +1125,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/libmpeg2-global-symbol-test.patch       \
   %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch           \
   %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch   \
-  %D%/packages/patches/libseccomp-open-aarch64.patch           \
   %D%/packages/patches/libsndfile-armhf-type-checks.patch      \
   %D%/packages/patches/libsndfile-CVE-2017-8361-8363-8365.patch        \
   %D%/packages/patches/libsndfile-CVE-2017-8362.patch          \
@@ -1265,7 +1266,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/sdl-pango-api_additions.patch           \
   %D%/packages/patches/sdl-pango-blit_overflow.patch           \
   %D%/packages/patches/sdl-pango-fillrect_crash.patch          \
-  %D%/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapToSurface.patch     \
+  %D%/packages/patches/sdl-pango-fix-explicit-SDLPango_CopyFTBitmapTo.patch    \
   %D%/packages/patches/sdl-pango-matrix_declarations.patch     \
   %D%/packages/patches/sdl-pango-sans-serif.patch              \
   %D%/packages/patches/patchutils-test-perms.patch             \
@@ -1357,6 +1358,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/qemu-CVE-2020-1711.patch                        \
   %D%/packages/patches/qemu-CVE-2020-7039.patch                        \
   %D%/packages/patches/qemu-CVE-2020-7211.patch                        \
+  %D%/packages/patches/qemu-CVE-2020-8608.patch                        \
   %D%/packages/patches/qemu-fix-documentation-build-failure.patch      \
   %D%/packages/patches/qrcodegen-cpp-make-install.patch                \
   %D%/packages/patches/qt4-ldflags.patch                       \
@@ -1415,8 +1417,8 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch      \
   %D%/packages/patches/sooperlooper-build-with-wx-30.patch     \
   %D%/packages/patches/soundconverter-remove-gconf-dependency.patch    \
-  %D%/packages/patches/spice-fix-test-armhf.patch              \
   %D%/packages/patches/steghide-fixes.patch                    \
+  %D%/packages/patches/suitesparse-mongoose-cmake.patch                \
   %D%/packages/patches/superlu-dist-awpm-grid.patch            \
   %D%/packages/patches/superlu-dist-scotchmetis.patch          \
   %D%/packages/patches/supertux-unbundle-squirrel.patch                \
@@ -1497,7 +1499,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/wicd-wpa2-ttls.patch                    \
   %D%/packages/patches/wmctrl-64-fix.patch                     \
   %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch        \
-  %D%/packages/patches/woff2-libbrotli.patch                   \
   %D%/packages/patches/wordnet-CVE-2008-2149.patch                     \
   %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch                 \
   %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch                 \