diff options
| author | Leo Famulari <leo@famulari.name> | 2017-01-06 17:14:41 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-01-06 17:14:41 -0500 |
| commit | 74288230ea8b2310495dc2739f39ceadcc143fd0 (patch) | |
| tree | 73ba6c7c13d59c5f92b409c94dccfff159e08f4d /gnu/packages/qemu.scm | |
| parent | 92e779592d269ca1924f184496eb4ca832997b12 (diff) | |
| parent | aa21c764d65068783ae31febee2a92eb3d138a24 (diff) | |
| download | gnu-guix-74288230ea8b2310495dc2739f39ceadcc143fd0.tar gnu-guix-74288230ea8b2310495dc2739f39ceadcc143fd0.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/qemu.scm')
| -rw-r--r-- | gnu/packages/qemu.scm | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm index e429c04244..4c47a09902 100644 --- a/gnu/packages/qemu.scm +++ b/gnu/packages/qemu.scm @@ -69,17 +69,14 @@ (define-public qemu (package (name "qemu") - (version "2.7.0") + (version "2.8.0") (source (origin (method url-fetch) (uri (string-append "http://wiki.qemu-project.org/download/qemu-" version ".tar.bz2")) (sha256 (base32 - "0lqyz01z90nvxpc3nx4djbci7hx62cwvs5zwd6phssds0sap6vij")) - (patches (search-patches "qemu-CVE-2016-8576.patch" - "qemu-CVE-2016-8577.patch" - "qemu-CVE-2016-8578.patch")))) + "0qjy3rcrn89n42y5iz60kgr0rrl29hpnj8mq2yvbc1wrcizmvzfs")))) (build-system gnu-build-system) (arguments '(;; Running tests in parallel can occasionally lead to failures, like: @@ -106,6 +103,8 @@ (apply system* `("./configure" ,(string-append "--cc=" (which "gcc")) + ;; Some architectures insist on using HOST_CC + ,(string-append "--host-cc=" (which "gcc")) "--disable-debug-info" ; save build space "--enable-virtfs" ; just to be sure ,(string-append "--prefix=" out) @@ -124,7 +123,7 @@ (add-before 'check 'make-gtester-verbose (lambda _ ;; Make GTester verbose to facilitate investigation upon failure. - (setenv "V" "1"))) + (setenv "V" "1") #t)) (add-before 'check 'disable-test-qga (lambda _ (substitute* "tests/Makefile.include" @@ -230,10 +229,10 @@ server and embedded PowerPC, and S390 guests.") ("pci.ids" ,(origin (method url-fetch) - (uri "http://pciids.sourceforge.net/v2.2/pci.ids") + (uri "https://raw.githubusercontent.com/pciutils/pciids/f9477789526f9d380bc57aa92e357c521738d5dd/pci.ids") (sha256 (base32 - "0h8v0lrlrxkfnjiwnwiq86zyvb8qa2n3844dp1m01lh2nb2fliqw")))) + "0g6dbwlamagxqxvng67xng3w2x56c0np4md1v1p1jn32qw518az0")))) ("usb.ids" ,(origin (method url-fetch) @@ -394,8 +393,9 @@ three libraries: (which "nosetests") "\""))) #t))))) (inputs - `(("libvirt" ,libvirt) - ("python-lxml" ,python-lxml))) + `(("libvirt" ,libvirt))) + (propagated-inputs + `(("python-lxml" ,python-lxml))) (native-inputs `(("pkg-config" ,pkg-config) ("python-nose" ,python-nose))) @@ -423,6 +423,7 @@ virtualization library.") (build-system python-build-system) (arguments `(#:python ,python-2 + #:use-setuptools? #f ; Uses custom distutils 'install' command. ;; Some of the tests seem to require network access to install virtual ;; machines. #:tests? #f |