HCoop / jackhill / guix / guix.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'master' into core-updates
[jackhill/guix/guix.git] / gnu / local.mk
diff --git a/gnu/local.mk b/gnu/local.mk
index 0ead43a..c10894c 100644 (file)
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -593,12 +593,12 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/bash-completion-directories.patch       \
   %D%/packages/patches/bazaar-CVE-2017-14176.patch             \
   %D%/packages/patches/beignet-correct-file-names.patch                \
-  %D%/packages/patches/binutils-aarch64-symbol-relocation.patch        \
   %D%/packages/patches/binutils-loongson-workaround.patch      \
   %D%/packages/patches/blast+-fix-makefile.patch               \
   %D%/packages/patches/boost-fix-icu-build.patch               \
   %D%/packages/patches/byobu-writable-status.patch             \
   %D%/packages/patches/cairo-CVE-2016-9082.patch                       \
+  %D%/packages/patches/cairo-setjmp-wrapper.patch              \
   %D%/packages/patches/calibre-no-updates-dialog.patch         \
   %D%/packages/patches/calibre-use-packaged-feedparser.patch   \
   %D%/packages/patches/catdoc-CVE-2017-11110.patch             \
@@ -649,7 +649,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/doc++-include-directives.patch          \
   %D%/packages/patches/doc++-segfault-fix.patch                        \
   %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \
-  %D%/packages/patches/doxygen-gcc-ice.patch                   \
   %D%/packages/patches/doxygen-test.patch                      \
   %D%/packages/patches/dropbear-CVE-2018-15599.patch           \
   %D%/packages/patches/dvd+rw-tools-add-include.patch          \
@@ -681,7 +680,9 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/fcgi-2.4.0-poll.patch                   \
   %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch                \
   %D%/packages/patches/fifo-map-remove-catch.hpp.patch         \
+  %D%/packages/patches/findutils-gnulib-libio.patch            \
   %D%/packages/patches/findutils-localstatedir.patch           \
+  %D%/packages/patches/findutils-makedev.patch                 \
   %D%/packages/patches/findutils-test-xargs.patch              \
   %D%/packages/patches/flann-cmake-3.11.patch                  \
   %D%/packages/patches/flint-ldconfig.patch                    \
@@ -691,7 +692,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/freeimage-CVE-2016-5684.patch           \
   %D%/packages/patches/freeimage-fix-build-with-gcc-5.patch    \
   %D%/packages/patches/freeimage-unbundle.patch                \
-  %D%/packages/patches/freetype-CVE-2018-6942.patch            \
   %D%/packages/patches/fuse-overlapping-headers.patch                          \
   %D%/packages/patches/gawk-shell.patch                                \
   %D%/packages/patches/gcc-arm-bug-71399.patch                 \
@@ -701,7 +701,9 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/gcc-fix-texi2pod.patch                  \
   %D%/packages/patches/gcc-4.8-libsanitizer-fix.patch          \
   %D%/packages/patches/gcc-4.9-libsanitizer-fix.patch          \
+  %D%/packages/patches/gcc-4.9-libsanitizer-ustat.patch                \
   %D%/packages/patches/gcc-libsanitizer-fix.patch              \
+  %D%/packages/patches/gcc-libsanitizer-ustat.patch            \
   %D%/packages/patches/gcc-libvtv-runpath.patch                        \
   %D%/packages/patches/gcc-strmov-store-file-names.patch       \
   %D%/packages/patches/gcc-4-compile-with-gcc-5.patch           \
@@ -731,7 +733,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/ghostscript-no-header-id.patch          \
   %D%/packages/patches/ghostscript-no-header-uuid.patch                \
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
-  %D%/packages/patches/ghostscript-runpath.patch               \
   %D%/packages/patches/giflib-make-reallocarray-private.patch  \
   %D%/packages/patches/glib-networking-ssl-cert-file.patch     \
   %D%/packages/patches/glib-tests-timer.patch                  \
@@ -754,6 +755,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/glibc-vectorized-strcspn-guards.patch   \
   %D%/packages/patches/glibc-versioned-locpath.patch           \
   %D%/packages/patches/glibc-2.27-git-fixes.patch              \
+  %D%/packages/patches/glibc-2.28-git-fixes.patch              \
   %D%/packages/patches/glusterfs-use-PATH-instead-of-hardcodes.patch           \
   %D%/packages/patches/glog-gcc-5-demangling.patch             \
   %D%/packages/patches/gmp-arm-asm-nothumb.patch               \
@@ -772,6 +774,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/grep-timing-sensitive-test.patch                \
   %D%/packages/patches/groff-source-date-epoch.patch           \
   %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch        \
+  %D%/packages/patches/grub-binutils-compat.patch              \
   %D%/packages/patches/grub-check-error-efibootmgr.patch       \
   %D%/packages/patches/gsl-test-i686.patch                     \
   %D%/packages/patches/gspell-dash-test.patch                  \
@@ -832,7 +835,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/java-xerces-bootclasspath.patch \
   %D%/packages/patches/java-xerces-build_dont_unzip.patch      \
   %D%/packages/patches/java-xerces-xjavac_taskdef.patch        \
-  %D%/packages/patches/jemalloc-arm-address-bits.patch         \
   %D%/packages/patches/jbig2dec-ignore-testtest.patch          \
   %D%/packages/patches/json-glib-fix-tests-32bit.patch         \
   %D%/packages/patches/jq-CVE-2015-8863.patch                  \
@@ -877,12 +879,12 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/libevent-2.1-skip-failing-test.patch    \
   %D%/packages/patches/libexif-CVE-2016-6328.patch             \
   %D%/packages/patches/libexif-CVE-2017-7544.patch             \
+  %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch \
   %D%/packages/patches/libgit2-mtime-0.patch                   \
   %D%/packages/patches/libgdata-fix-tests.patch                        \
   %D%/packages/patches/libgdata-glib-duplicate-tests.patch     \
   %D%/packages/patches/libgnome-encoding.patch                 \
   %D%/packages/patches/libgnomeui-utf8.patch                   \
-  %D%/packages/patches/libgpg-error-aarch64-logging-fix.patch  \
   %D%/packages/patches/libgxps-CVE-2017-11590.patch            \
   %D%/packages/patches/libffi-3.2.1-complex-alpha.patch                \
   %D%/packages/patches/libjxr-fix-function-signature.patch     \
@@ -943,7 +945,6 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/mailutils-uninitialized-memory.patch    \
   %D%/packages/patches/make-glibc-compat.patch                 \
   %D%/packages/patches/make-impure-dirs.patch                  \
-  %D%/packages/patches/mariadb-gcc-ice.patch                   \
   %D%/packages/patches/mariadb-client-test-32bit.patch         \
   %D%/packages/patches/mars-install.patch                      \
   %D%/packages/patches/mars-sfml-2.3.patch                     \
@@ -977,6 +978,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch    \
   %D%/packages/patches/mutt-store-references.patch             \
   %D%/packages/patches/myrepos-CVE-2018-7032.patch             \
+  %D%/packages/patches/m4-gnulib-libio.patch                   \
   %D%/packages/patches/net-tools-bitrot.patch                  \
   %D%/packages/patches/netcdf-date-time.patch                  \
   %D%/packages/patches/netcdf-tst_h_par.patch                  \
@@ -993,6 +995,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/nvi-db4.patch                           \
   %D%/packages/patches/nyacc-binary-literals.patch             \
   %D%/packages/patches/nyx-show-header-stats-with-python3.patch        \
+  %D%/packages/patches/oath-toolkit-glibc-compat.patch         \
   %D%/packages/patches/ocaml-bisect-fix-camlp4-in-another-directory.patch      \
   %D%/packages/patches/ocaml-bitstring-fix-configure.patch \
   %D%/packages/patches/ocaml-CVE-2015-8869.patch               \
@@ -1009,8 +1012,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/openocd-nrf52.patch                     \
   %D%/packages/patches/opensmtpd-fix-crash.patch               \
   %D%/packages/patches/openssl-runpath.patch                   \
-  %D%/packages/patches/openssl-1.0.2-CVE-2018-0495.patch       \
-  %D%/packages/patches/openssl-1.0.2-CVE-2018-0732.patch       \
   %D%/packages/patches/openssl-1.1-c-rehash-in.patch           \
   %D%/packages/patches/openssl-c-rehash-in.patch               \
   %D%/packages/patches/orpheus-cast-errors-and-includes.patch  \
@@ -1020,13 +1021,11 @@ dist_patch_DATA =                                               \
   %D%/packages/patches/p7zip-CVE-2016-9296.patch               \
   %D%/packages/patches/p7zip-CVE-2017-17969.patch              \
   %D%/packages/patches/p7zip-remove-unused-code.patch          \
+  %D%/packages/patches/parted-glibc-compat.patch               \
   %D%/packages/patches/patchelf-page-size.patch                        \
   %D%/packages/patches/patchelf-rework-for-arm.patch           \
   %D%/packages/patches/patchutils-xfail-gendiff-tests.patch    \
   %D%/packages/patches/patch-hurd-path-max.patch               \
-  %D%/packages/patches/perf-gcc-ice.patch                      \
-  %D%/packages/patches/perl-archive-tar-CVE-2018-12015.patch   \
-  %D%/packages/patches/perl-file-path-CVE-2017-6512.patch      \
   %D%/packages/patches/perl-autosplit-default-time.patch       \
   %D%/packages/patches/perl-deterministic-ordering.patch       \
   %D%/packages/patches/perl-finance-quote-unuse-mozilla-ca.patch \
@@ -1081,7 +1080,6 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/python-fix-tests.patch                  \
   %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \
   %D%/packages/patches/python-networkx2-reproducible-build.patch       \
-  %D%/packages/patches/python-pillow-fix-failing-tests.patch   \
   %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \
   %D%/packages/patches/python-scikit-learn-fix-test-non-determinism.patch      \
   %D%/packages/patches/python-configobj-setuptools.patch       \
@@ -1098,6 +1096,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/python-waitress-fix-tests.patch         \
   %D%/packages/patches/qemu-glibc-2.27.patch                   \
   %D%/packages/patches/qt4-ldflags.patch                       \
+  %D%/packages/patches/qtbase-glibc-compat.patch               \
   %D%/packages/patches/qtbase-use-TZDIR.patch                  \
   %D%/packages/patches/qtscript-disable-tests.patch            \
   %D%/packages/patches/quagga-reproducible-build.patch          \
@@ -1142,6 +1141,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/slim-sigusr1.patch                      \
   %D%/packages/patches/slim-reset.patch                                \
   %D%/packages/patches/slim-login.patch                                \
+  %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch      \
   %D%/packages/patches/sooperlooper-build-with-wx-30.patch     \
   %D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch   \
   %D%/packages/patches/soundtouch-CVE-2018-1000223.patch       \
@@ -1160,6 +1160,8 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/tcsh-fix-out-of-bounds-read.patch       \
   %D%/packages/patches/teensy-loader-cli-help.patch            \
   %D%/packages/patches/teeworlds-use-latest-wavpack.patch      \
+  %D%/packages/patches/texinfo-perl-compat.patch               \
+  %D%/packages/patches/texinfo-5-perl-compat.patch             \
   %D%/packages/patches/texi2html-document-encoding.patch       \
   %D%/packages/patches/texi2html-i18n.patch                    \
   %D%/packages/patches/thefuck-test-environ.patch              \
jackhill's copy of GNU Guix: https://guix.gnu.org/