diff options
| author | Marius Bakke <marius@gnu.org> | 2021-10-14 00:01:12 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-10-14 00:01:12 +0200 |
| commit | 0f77e50139b023cb1a5a82ac3a0b9b7fa990c45b (patch) | |
| tree | 8796bb011e021bf01fe5cb15c70641ee0c0ed5f0 /gnu/local.mk | |
| parent | 641b31de5e9716ff8bd088f4834c98d4a664b55a (diff) | |
| parent | 1961b28445080c7b9fb8bf5291ac9a814303522a (diff) | |
| download | guix-0f77e50139b023cb1a5a82ac3a0b9b7fa990c45b.tar.gz | |
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index a2201a5a74..c1f2399a46 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -960,7 +960,6 @@ dist_patch_DATA = \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ %D%/packages/patches/coreutils-gnulib-tests.patch \ %D%/packages/patches/coreutils-ls.patch \ - %D%/packages/patches/cpufrequtils-fix-aclocal.patch \ %D%/packages/patches/cpuinfo-system-libraries.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \ %D%/packages/patches/crda-optional-gcrypt.patch \ @@ -1073,6 +1072,7 @@ dist_patch_DATA = \ %D%/packages/patches/ganeti-haskell-pythondir.patch \ %D%/packages/patches/ganeti-shepherd-master-failover.patch \ %D%/packages/patches/ganeti-shepherd-support.patch \ + %D%/packages/patches/ganeti-sphinx-compat.patch \ %D%/packages/patches/gash-utils-ls-test.patch \ %D%/packages/patches/gawk-shell.patch \ %D%/packages/patches/gcc-arm-bug-71399.patch \ @@ -1369,6 +1369,7 @@ dist_patch_DATA = \ %D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnomeui-utf8.patch \ %D%/packages/patches/libgrss-CVE-2016-2001.patch \ + %D%/packages/patches/libhx-fix-double-free-bug.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ %D%/packages/patches/libofa-ftbfs-1.diff \ @@ -1688,8 +1689,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/qemu-build-info-manual.patch \ %D%/packages/patches/qemu-CVE-2021-20203.patch \ - %D%/packages/patches/qemu-meson-compat.patch \ - %D%/packages/patches/qemu-sphinx-compat.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qemu-glibc-2.30.patch \ %D%/packages/patches/qpdfview-qt515-compat.patch \ |