diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-01-26 23:40:24 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-26 23:40:24 +0100 |
commit | 1d7051f82b3235bc62c02ee9df56974803f7e20e (patch) | |
tree | 6dfb0832b24f5d07869900c7d662c91a7469445f /gnu/local.mk | |
parent | 80921d298ae87444ca4b401ab71ba038d5fe6d40 (diff) | |
parent | 435c2c39aa364d43facc61967eba833165adc966 (diff) | |
download | guix-1d7051f82b3235bc62c02ee9df56974803f7e20e.tar guix-1d7051f82b3235bc62c02ee9df56974803f7e20e.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 6cd6a1c672..7267bb79de 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1336,6 +1336,9 @@ dist_patch_DATA = \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ + %D%/packages/patches/qemu-CVE-2020-7039.patch \ + %D%/packages/patches/qemu-CVE-2020-7211.patch \ + %D%/packages/patches/qemu-fix-documentation-build-failure.patch \ %D%/packages/patches/qt4-ldflags.patch \ %D%/packages/patches/qtbase-use-TZDIR.patch \ %D%/packages/patches/qtscript-disable-tests.patch \ |