diff options
author | Mark H Weaver <mhw@netris.org> | 2016-11-07 00:33:16 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-11-07 00:33:16 -0500 |
commit | 71e21fb26dceef7a665b3b1c0dec7ebd92d8ec82 (patch) | |
tree | 7553a6f9ee2ed7494968e7277897098559eacf23 /gnu/local.mk | |
parent | 19ac2ba858ebc46db96364809ebfc129be9e4ccf (diff) | |
parent | 14ac8e4865206f5cd1278cd962d01ce27890d51f (diff) | |
download | gnu-guix-71e21fb26dceef7a665b3b1c0dec7ebd92d8ec82.tar gnu-guix-71e21fb26dceef7a665b3b1c0dec7ebd92d8ec82.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 4bdace4768..e1fd8ce8a9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -614,7 +614,6 @@ dist_patch_DATA = \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/inkscape-drop-wait-for-targets.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ - %D%/packages/patches/jansson-CVE-2016-4425.patch \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ %D%/packages/patches/jq-CVE-2015-8863.patch \ %D%/packages/patches/khmer-use-libraries.patch \ @@ -690,7 +689,7 @@ dist_patch_DATA = \ %D%/packages/patches/lua-pkgconfig.patch \ %D%/packages/patches/lua51-liblua-so.patch \ %D%/packages/patches/lua51-pkgconfig.patch \ - %D%/packages/patches/lua52-liblua-so.patch \ + %D%/packages/patches/lua-liblua-so.patch \ %D%/packages/patches/luajit-no_ldconfig.patch \ %D%/packages/patches/luajit-symlinks.patch \ %D%/packages/patches/luit-posix.patch \ |