Merge branch 'master' into staging

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

diff --git a/gnu/local.mk b/gnu/local.mk
index c7625a7..918c9eb 100644 (file)
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1299,6 +1299,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/iputils-libcap-compat.patch             \
   %D%/packages/patches/ipxe-reproducible-geniso.patch          \
   %D%/packages/patches/irrlicht-use-system-libs.patch          \
+  %D%/packages/patches/irrlicht-link-against-needed-libs.patch \
   %D%/packages/patches/isl-0.11.1-aarch64-support.patch        \
   %D%/packages/patches/itk-snap-alt-glibc-compat.patch         \
   %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch        \
@@ -1403,7 +1404,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/libmad-length-check.patch               \
   %D%/packages/patches/libmad-md_size.patch                    \
   %D%/packages/patches/libmad-mips-newgcc.patch                        \
-  %D%/packages/patches/libmicrohttpd-0.9.73-test-ssl3.patch    \
   %D%/packages/patches/libmp4v2-c++11.patch                    \
   %D%/packages/patches/libmpeg2-arm-private-symbols.patch      \
   %D%/packages/patches/libmpeg2-global-symbol-test.patch       \
@@ -1491,7 +1491,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/meson-allow-dirs-outside-of-prefix.patch        \
   %D%/packages/patches/mhash-keygen-test-segfault.patch                \
   %D%/packages/patches/mia-fix-boost-headers.patch             \
-  %D%/packages/patches/minetest-add-MINETEST_MOD_PATH.patch    \
   %D%/packages/patches/mingw-w64-6.0.0-gcc.patch               \
   %D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch     \
   %D%/packages/patches/mingw-w64-reproducible-gendef.patch     \
@@ -1520,6 +1519,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/m4-gnulib-libio.patch                   \
   %D%/packages/patches/nautilus-add-libportal-gtk3.patch       \
   %D%/packages/patches/ncompress-fix-softlinks.patch           \
+  %D%/packages/patches/ncftp-reproducible.patch                        \
   %D%/packages/patches/netcdf-date-time.patch                  \
   %D%/packages/patches/netpbm-CVE-2017-2586.patch              \
   %D%/packages/patches/netpbm-CVE-2017-2587.patch              \
@@ -1691,6 +1691,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/python-piexif-fix-tests-with-pillow-7.2.patch   \
   %D%/packages/patches/python-pyfakefs-remove-bad-test.patch   \
   %D%/packages/patches/python-pyflakes-test-location.patch     \
+  %D%/packages/patches/python2-pyopenssl-openssl-compat.patch  \
   %D%/packages/patches/python-flint-includes.patch             \
   %D%/packages/patches/python-libxml2-utf8.patch               \
   %D%/packages/patches/python-magic-python-bytecode.patch      \