Merge branch 'master' into xorg-updates

This commit is contained in:
Mark H Weaver 2014-12-26 09:05:25 -05:00
commit 8a984cb307
1 changed files with 2 additions and 2 deletions

View File

@ -42,14 +42,14 @@
;; This is QEMU without GUI support. ;; This is QEMU without GUI support.
(package (package
(name "qemu-headless") (name "qemu-headless")
(version "2.0.0") (version "2.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://wiki.qemu-project.org/download/qemu-" (uri (string-append "http://wiki.qemu-project.org/download/qemu-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0frsahiw56jr4cqr9m6s383lyj4ar9hfs2wp3y4yr76krah1mk30")))) "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (alist-replace '(#:phases (alist-replace