diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-05-11 13:37:47 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-05-11 13:37:47 -0400 |
| commit | 9f5e79675367aedd6be89e07edbc08a6e3695fab (patch) | |
| tree | 2679dfc572b7173ba6fe52611047a47283af119d /gnu/packages/qemu.scm | |
| parent | e2b89203db6c2056c9658be40ab1be471769d9eb (diff) | |
| parent | cf60e76a9503156a8c1047fa446525b28842f7e8 (diff) | |
| download | guix-9f5e79675367aedd6be89e07edbc08a6e3695fab.tar.gz | |
Merge branch 'master' into gnome-updates
Diffstat (limited to 'gnu/packages/qemu.scm')
| -rw-r--r-- | gnu/packages/qemu.scm | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm index c0ee504b24..9e3fbf462c 100644 --- a/gnu/packages/qemu.scm +++ b/gnu/packages/qemu.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -54,30 +55,20 @@ (define-public qemu (package (name "qemu") - (version "2.5.0") + (version "2.5.1.1") (source (origin (method url-fetch) (uri (string-append "http://wiki.qemu-project.org/download/qemu-" version ".tar.bz2")) (sha256 (base32 - "1m3j6xl7msrniidkvr5pw9d44yba5m7hm42xz8xy77v105s8hhrl")) - (patches (search-patches - "qemu-virtio-9p-use-accessor-to-get-thread-pool.patch" - "qemu-CVE-2015-8558.patch" - "qemu-CVE-2015-8567.patch" - "qemu-CVE-2016-1922.patch" - "qemu-CVE-2015-8613.patch" - "qemu-CVE-2015-8701.patch" - "qemu-CVE-2015-8743.patch" - "qemu-CVE-2016-1568.patch" - "qemu-CVE-2015-8619.patch" - "qemu-CVE-2016-1981.patch" - "qemu-usb-ehci-oob-read.patch" - "qemu-CVE-2016-2197.patch")))) + "1rpgr1v6gnsdb4bcxwn1krsz4d4h9xgvlg6ark648nkn8dp99n98")))) (build-system gnu-build-system) (arguments - '(#:phases (alist-replace + '(;; FIXME: On x86_64, the test 'check-qtest-x86_64' sometimes fails when + ;; parallel builds are enabled. + #:parallel-tests? #f + #:phases (alist-replace 'configure (lambda* (#:key inputs outputs (configure-flags '()) #:allow-other-keys) |