Merge branch 'wip-guix-home'

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

diff --git a/gnu/local.mk b/gnu/local.mk
index 8212bc5..5bd7dce 100644 (file)
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -445,6 +445,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/parallel.scm                    \
   %D%/packages/pascal.scm                      \
   %D%/packages/password-utils.scm              \
+  %D%/packages/patool.scm                      \
   %D%/packages/patchutils.scm                  \
   %D%/packages/pciutils.scm                    \
   %D%/packages/pcre.scm                                \
@@ -931,7 +932,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/clang-9.0-libc-search-path.patch                \
   %D%/packages/patches/clang-10.0-libc-search-path.patch       \
   %D%/packages/patches/clang-11.0-libc-search-path.patch       \
-  %D%/packages/patches/clang-12-tools-extra-directory.patch    \
   %D%/packages/patches/clang-runtime-asan-build-fixes.patch    \
   %D%/packages/patches/clang-runtime-esan-build-fixes.patch    \
   %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch   \
@@ -1195,6 +1195,8 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/gobject-introspection-cc.patch          \
   %D%/packages/patches/gobject-introspection-girepository.patch        \
   %D%/packages/patches/go-fix-script-tests.patch                       \
+  %D%/packages/patches/go-github-com-urfave-cli-fix-tests.patch \
+  %D%/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch \
   %D%/packages/patches/go-skip-gc-test.patch                   \
   %D%/packages/patches/gpm-glibc-2.26.patch                    \
   %D%/packages/patches/gpodder-disable-updater.patch           \
@@ -1444,7 +1446,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/luajit-no_ldconfig.patch                        \
   %D%/packages/patches/luit-posix.patch                                \
   %D%/packages/patches/lvm2-static-link.patch                  \
-  %D%/packages/patches/mailutils-fix-uninitialized-variable.patch      \
   %D%/packages/patches/mailutils-variable-lookup.patch         \
   %D%/packages/patches/make-impure-dirs.patch                  \
   %D%/packages/patches/marble-qt-add-qt-headers.patch          \
@@ -1514,11 +1515,11 @@ dist_patch_DATA =                                               \
   %D%/packages/patches/ngircd-handle-zombies.patch             \
   %D%/packages/patches/network-manager-plugin-path.patch       \
   %D%/packages/patches/nginx-socket-cloexec.patch              \
+  %D%/packages/patches/nnpack-system-libraries.patch           \
   %D%/packages/patches/nsis-env-passthru.patch                 \
   %D%/packages/patches/nsis-source-date-epoch.patch            \
   %D%/packages/patches/nss-increase-test-timeout.patch         \
   %D%/packages/patches/nss-3.56-pkgconfig.patch                        \
-  %D%/packages/patches/ntfs-3g-CVE-2019-9755.patch             \
   %D%/packages/patches/nvi-assume-preserve-path.patch          \
   %D%/packages/patches/nvi-dbpagesize-binpower.patch           \
   %D%/packages/patches/nvi-db4.patch                           \
@@ -1579,7 +1580,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/smalltalk-multiplication-overflow.patch \
   %D%/packages/patches/sqlite-hurd.patch                       \
   %D%/packages/patches/sunxi-tools-remove-sys-io.patch \
-  %D%/packages/patches/patchutils-test-perms.patch             \
   %D%/packages/patches/patch-hurd-path-max.patch               \
   %D%/packages/patches/perl-autosplit-default-time.patch       \
   %D%/packages/patches/perl-cross.patch                                \
@@ -1713,6 +1713,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/ripperx-missing-file.patch              \
   %D%/packages/patches/rpcbind-CVE-2017-8779.patch             \
   %D%/packages/patches/rtags-separate-rct.patch                        \
+  %D%/packages/patches/racket-minimal-backport-1629887.patch    \
   %D%/packages/patches/racket-minimal-sh-via-rktio.patch       \
   %D%/packages/patches/remake-impure-dirs.patch                        \
   %D%/packages/patches/restic-0.9.6-fix-tests-for-go1.15.patch \
@@ -1820,6 +1821,8 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/ucx-tcp-iface-ioctl.patch               \
   %D%/packages/patches/udiskie-no-appindicator.patch           \
   %D%/packages/patches/ungoogled-chromium-extension-search-path.patch  \
+  %D%/packages/patches/ungoogled-chromium-ffmpeg-compat.patch  \
+  %D%/packages/patches/ungoogled-chromium-system-nspr.patch    \
   %D%/packages/patches/unison-fix-ocaml-4.08.patch             \
   %D%/packages/patches/unknown-horizons-python-3.8-distro.patch        \
   %D%/packages/patches/unzip-CVE-2014-8139.patch               \
@@ -1897,6 +1900,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/xf86-video-voodoo-pcitag.patch          \
   %D%/packages/patches/xfce4-panel-plugins.patch               \
   %D%/packages/patches/xfce4-settings-defaults.patch           \
+  %D%/packages/patches/xgboost-use-system-dmlc-core.patch       \
   %D%/packages/patches/xmonad-dynamic-linking.patch            \
   %D%/packages/patches/xnnpack-system-libraries.patch          \
   %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch           \