diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-11-07 21:09:57 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-11-07 21:09:57 +0100 |
| commit | 55174e668f2985d1c4efda4fbf58f4061dde0db2 (patch) | |
| tree | f55f7e50fff1a1c3d1e6d2e932a7ef19347e5011 /gnu/local.mk | |
| parent | 1badc85068ee0be2a028c1b94a3dd285901bc391 (diff) | |
| parent | b31e1561611ebe4916890183b24e6e13cb83bf59 (diff) | |
| download | gnu-guix-55174e668f2985d1c4efda4fbf58f4061dde0db2.tar gnu-guix-55174e668f2985d1c4efda4fbf58f4061dde0db2.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 86f081f7cf..90dbe94025 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -726,7 +726,6 @@ dist_patch_DATA = \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-freetype-test-failure.patch \ %D%/packages/patches/gdm-CVE-2018-14424.patch \ - %D%/packages/patches/gemma-intel-compat.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-dont-pass-linker-flags-via-response-files.patch \ @@ -838,7 +837,6 @@ dist_patch_DATA = \ %D%/packages/patches/java-xerces-xjavac_taskdef.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 \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/khmer-use-libraries.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ @@ -882,6 +880,7 @@ dist_patch_DATA = \ %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/libgit2-oom-test.patch \ %D%/packages/patches/libgdata-fix-tests.patch \ %D%/packages/patches/libgdata-glib-duplicate-tests.patch \ %D%/packages/patches/libgnome-encoding.patch \ |