diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-12 20:57:38 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-12 20:57:38 +0100 |
| commit | 8f1ab291bca31e84bec50da4374175367d498a6f (patch) | |
| tree | e96a6f7a44382646733ac08ecaccb2f57182f017 /gnu/local.mk | |
| parent | f0bce2e08feb157b3d8b5100b1ea26bbbd6141e3 (diff) | |
| parent | 2e4bb89354d909b661208b3900abfeaa621a1582 (diff) | |
| download | guix-8f1ab291bca31e84bec50da4374175367d498a6f.tar guix-8f1ab291bca31e84bec50da4374175367d498a6f.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 33cf439870..9dd67ddd5c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1030,6 +1030,7 @@ dist_patch_DATA = \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ %D%/packages/patches/jfsutils-add-sysmacros.patch \ %D%/packages/patches/jfsutils-include-systypes.patch \ + %D%/packages/patches/jsoncpp-fix-inverted-case.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch \ %D%/packages/patches/libvirt-create-machine-cgroup.patch \ @@ -1456,9 +1457,6 @@ dist_patch_DATA = \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ - %D%/packages/patches/wavpack-CVE-2018-6767.patch \ - %D%/packages/patches/wavpack-CVE-2018-7253.patch \ - %D%/packages/patches/wavpack-CVE-2018-7254.patch \ %D%/packages/patches/weasyprint-library-paths.patch \ %D%/packages/patches/websocketpp-fix-for-boost-1.70.patch \ %D%/packages/patches/wicd-bitrate-none-fix.patch \ |