diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-09-02 15:57:56 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-02 15:57:56 +0200 |
commit | 30dfac27a5642c36e7bb1ba7966566864ba2d28d (patch) | |
tree | 3b59623014eeea1df02cda5f926d803b9a36a828 /gnu/packages/virtualization.scm | |
parent | d2ee294c0400ac8f2a10f10c3c9644da513a3712 (diff) | |
parent | 65e4109cdc96fbaee088f50d0138af8acef43141 (diff) | |
download | guix-30dfac27a5642c36e7bb1ba7966566864ba2d28d.tar guix-30dfac27a5642c36e7bb1ba7966566864ba2d28d.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/virtualization.scm')
-rw-r--r-- | gnu/packages/virtualization.scm | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index d06c55bd57..32d10dcf82 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -72,26 +72,14 @@ (define-public qemu (package (name "qemu") - (version "2.9.0") + (version "2.10.0") (source (origin (method url-fetch) - (uri (string-append "http://wiki.qemu-project.org/download/qemu-" + (uri (string-append "https://download.qemu.org/qemu-" version ".tar.xz")) - (patches (search-patches "qemu-CVE-2017-7493.patch" - "qemu-CVE-2017-8112.patch" - "qemu-CVE-2017-8309.patch" - "qemu-CVE-2017-8379.patch" - "qemu-CVE-2017-8380.patch" - "qemu-CVE-2017-9524.patch" - "qemu-CVE-2017-10664.patch" - "qemu-CVE-2017-10806.patch" - "qemu-CVE-2017-10911.patch" - "qemu-CVE-2017-11334.patch" - "qemu-CVE-2017-11434.patch" - "qemu-CVE-2017-12809.patch")) (sha256 (base32 - "08mhfs0ndbkyqgw7fjaa9vjxf4dinrly656f6hjzvmaz7hzc677h")))) + "0dgk7zcni41nf1jp84y0m6dk2nb4frnh571m8hkiv0m4hz4imn2m")))) (build-system gnu-build-system) (arguments '(;; Running tests in parallel can occasionally lead to failures, like: |