diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-09-27 21:14:27 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-27 21:14:27 +0200 |
commit | 9f1d112d1282216f16b2f673c8213d2839e39b7a (patch) | |
tree | 890d036d75ae0d38ebff39a4be000959e71409ec /gnu/local.mk | |
parent | 859620e51db0b7ffb666cd47146eca4fd4d6ba63 (diff) | |
parent | cb1e0cfc2f32e6811da588231497d896491ceabb (diff) | |
download | guix-9f1d112d1282216f16b2f673c8213d2839e39b7a.tar guix-9f1d112d1282216f16b2f673c8213d2839e39b7a.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 0991fe5ff2..0afda9ff25 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -552,7 +552,6 @@ dist_patch_DATA = \ %D%/packages/patches/ceph-disable-unittest-throttle.patch \ %D%/packages/patches/ceph-skip-collect-sys-info-test.patch \ %D%/packages/patches/ceph-skip-unittest_blockdev.patch \ - %D%/packages/patches/python-acme-dont-use-openssl-rand.patch \ %D%/packages/patches/chicken-CVE-2017-6949.patch \ %D%/packages/patches/chicken-CVE-2017-11343.patch \ %D%/packages/patches/chmlib-inttypes.patch \ @@ -587,7 +586,6 @@ dist_patch_DATA = \ %D%/packages/patches/doc++-segfault-fix.patch \ %D%/packages/patches/doxygen-test.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ - %D%/packages/patches/e2fsprogs-32bit-quota-warnings.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elixir-disable-failing-tests.patch \ %D%/packages/patches/einstein-build.patch \ @@ -615,7 +613,6 @@ dist_patch_DATA = \ %D%/packages/patches/flint-ldconfig.patch \ %D%/packages/patches/fltk-shared-lib-defines.patch \ %D%/packages/patches/fltk-xfont-on-demand.patch \ - %D%/packages/patches/fontforge-svg-modtime.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ %D%/packages/patches/freeimage-CVE-2015-0852.patch \ @@ -808,7 +805,6 @@ dist_patch_DATA = \ %D%/packages/patches/libtirpc-CVE-2017-8779.patch \ %D%/packages/patches/libtorrent-rasterbar-boost-compat.patch \ %D%/packages/patches/libtool-skip-tests2.patch \ - %D%/packages/patches/libunwind-CVE-2015-3239.patch \ %D%/packages/patches/libunistring-gnulib-multi-core.patch \ %D%/packages/patches/libusb-0.1-disable-tests.patch \ %D%/packages/patches/libvpx-CVE-2016-2818.patch \ |