Merge branch 'master' into staging

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

diff --git a/gnu/local.mk b/gnu/local.mk
index 68ed1d4..a350174 100644 (file)
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
 # 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, 2019 Mark H Weaver <mhw@netris.org>
@@ -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                      \
@@ -720,7 +721,6 @@ dist_patch_DATA =                                           \
   %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  \
-  %D%/packages/patches/appstream-glib-2020.patch               \
   %D%/packages/patches/apr-skip-getservbyname-test.patch       \
   %D%/packages/patches/arm-trusted-firmware-disable-hdcp.patch \
   %D%/packages/patches/aspell-default-dict-dir.patch           \
@@ -771,9 +771,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/catdoc-CVE-2017-11110.patch             \
   %D%/packages/patches/cdparanoia-fpic.patch                   \
   %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch     \
-  %D%/packages/patches/ceph-boost-compat.patch                 \
   %D%/packages/patches/ceph-disable-cpu-optimizations.patch    \
-  %D%/packages/patches/ceph-volume-respect-PATH.patch          \
   %D%/packages/patches/chmlib-inttypes.patch                   \
   %D%/packages/patches/clamav-config-llvm-libs.patch           \
   %D%/packages/patches/clamav-system-tomsfastmath.patch                \
@@ -1097,7 +1095,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/libexif-CVE-2018-20030.patch            \
   %D%/packages/patches/libextractor-exiv2.patch                        \
   %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch         \
-  %D%/packages/patches/libgit2-avoid-python.patch              \
   %D%/packages/patches/libgit2-mtime-0.patch                   \
   %D%/packages/patches/libgnome-encoding.patch                 \
   %D%/packages/patches/libgnomeui-utf8.patch                   \
@@ -1411,6 +1408,7 @@ dist_patch_DATA =                                         \
   %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                \