diff options
author | Leo Famulari <leo@famulari.name> | 2018-10-07 20:49:14 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2018-10-07 20:49:14 -0400 |
commit | e8bd1946ec1df9f52f87292172af5b4e4a4e0023 (patch) | |
tree | e3209b814be53b0c21f29438a491c2aedcc2d1c5 /gnu/local.mk | |
parent | cf6db76d2af2f287f12928df160447ab4165b3e5 (diff) | |
parent | a18accba468beecf0200383f56d02894caf6f41a (diff) | |
download | guix-patches-e8bd1946ec1df9f52f87292172af5b4e4a4e0023.tar guix-patches-e8bd1946ec1df9f52f87292172af5b4e4a4e0023.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index d4e986ce3e..15c8159460 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -77,6 +77,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/backup.scm \ %D%/packages/base.scm \ %D%/packages/bash.scm \ + %D%/packages/batik.scm \ %D%/packages/bdw-gc.scm \ %D%/packages/benchmark.scm \ %D%/packages/bioconductor.scm \ @@ -591,11 +592,13 @@ dist_patch_DATA = \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/azr3.patch \ %D%/packages/patches/bash-completion-directories.patch \ + %D%/packages/patches/bastet-change-source-of-unordered_set.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ %D%/packages/patches/beignet-correct-file-names.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/borg-respect-storage-quota.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/cairo-CVE-2016-9082.patch \ %D%/packages/patches/cairo-setjmp-wrapper.patch \ @@ -763,6 +766,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnome-todo-libical-compat.patch \ %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ %D%/packages/patches/gnucash-price-quotes-perl.patch \ + %D%/packages/patches/gnucash-disable-failing-tests.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gnutls-skip-pkgconfig-test.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ @@ -954,7 +958,6 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4409.patch \ %D%/packages/patches/mcrypt-CVE-2012-4426.patch \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ - %D%/packages/patches/mes-nyacc-0.86.0.patch \ %D%/packages/patches/mesa-skip-disk-cache-test.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ %D%/packages/patches/metabat-fix-compilation.patch \ |