diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-05-23 14:55:44 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-05-23 15:02:26 +0200 |
| commit | bc73a84398fa54b0a11a80c749bf78eb0a58dbe6 (patch) | |
| tree | 3e7b6670989ceb4f31464bad632c0332121d96a0 /gnu/packages/qemu.scm | |
| parent | 12b6f6527e49c8c4191929a72b1692dbd9eb2440 (diff) | |
| parent | 624d4e2e6ba402c374a340869306eec65a808a20 (diff) | |
| download | guix-bc73a84398fa54b0a11a80c749bf78eb0a58dbe6.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/qemu.scm')
| -rw-r--r-- | gnu/packages/qemu.scm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm index 9e3fbf462c..6dd6ce4d76 100644 --- a/gnu/packages/qemu.scm +++ b/gnu/packages/qemu.scm @@ -55,20 +55,17 @@ (define-public qemu (package (name "qemu") - (version "2.5.1.1") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append "http://wiki.qemu-project.org/download/qemu-" version ".tar.bz2")) (sha256 (base32 - "1rpgr1v6gnsdb4bcxwn1krsz4d4h9xgvlg6ark648nkn8dp99n98")))) + "1v1lhhd6m59hqgmiz100g779rjq70pik5v4b3g936ci73djlmb69")))) (build-system gnu-build-system) (arguments - '(;; FIXME: On x86_64, the test 'check-qtest-x86_64' sometimes fails when - ;; parallel builds are enabled. - #:parallel-tests? #f - #:phases (alist-replace + '(#:phases (alist-replace 'configure (lambda* (#:key inputs outputs (configure-flags '()) #:allow-other-keys) |