diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-02-05 22:08:06 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-05 22:08:06 +0100 |
commit | f10921c5ade56534633eae0da94da6e81aacc2aa (patch) | |
tree | 599d0256cc509f47a3e75ea1214d5374de51eee8 /gnu/local.mk | |
parent | 0a83339bb1429332ee889e9a976aa214ae2ac0db (diff) | |
parent | 9d0dfd9a9a7c43363a4e140c20d49f119fe6f2e3 (diff) | |
download | guix-f10921c5ade56534633eae0da94da6e81aacc2aa.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
-rw-r--r-- | gnu/local.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 125118bc55..eba3e92171 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -502,6 +502,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/tor.scm \ %D%/packages/tv.scm \ %D%/packages/uml.scm \ + %D%/packages/unicode.scm \ %D%/packages/unrtf.scm \ %D%/packages/upnp.scm \ %D%/packages/usb-modeswitch.scm \ @@ -1349,6 +1350,7 @@ 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-1711.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 \ |