diff options
author | Mark H Weaver <mhw@netris.org> | 2018-01-19 23:59:20 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2018-01-19 23:59:20 -0500 |
commit | e074a655dd6497daafbd62737e3b63f3d5aa7985 (patch) | |
tree | 2b198ba5c664cdd58e155f3c0113d1cebde0fc91 /gnu/packages/virtualization.scm | |
parent | 6d7b26a39faf42c37f15dc64a30a77e5e194ea23 (diff) | |
parent | ccb5cac17be98aaa9c3225605d6170c675d8e8e6 (diff) | |
download | guix-e074a655dd6497daafbd62737e3b63f3d5aa7985.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/virtualization.scm')
-rw-r--r-- | gnu/packages/virtualization.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index fa72c72c15..a5ce3f6fa8 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> -;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -345,14 +345,14 @@ manage system or application containers.") (define-public libvirt (package (name "libvirt") - (version "3.10.0") + (version "4.0.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (sha256 (base32 - "03kb37iv3dvvdlslznlc0njvjpmq082lczmsslz5p4fcwb50kwfz")))) + "1j6zzajh4j3zzsaqn5f5mrchm0590xcf6rzkfajvqw3bd4dcms79")))) (build-system gnu-build-system) (arguments `(;; FAIL: virshtest @@ -362,7 +362,7 @@ manage system or application containers.") ;; FAIL: networkxml2firewalltest ;; FAIL: nwfilterebiptablestest ;; FAIL: nwfilterxml2firewalltest - ;; Times while running commandest. + ;; Time-out while running commandtest. #:tests? #f #:configure-flags (list "--with-polkit" @@ -382,9 +382,9 @@ manage system or application containers.") ;; at runtime, we must prevent writing to them at installation ;; time. (lambda _ - (zero? (system* "make" "install" - "sysconfdir=/tmp/etc" - "localstatedir=/tmp/var")))) + (invoke "make" "install" + "sysconfdir=/tmp/etc" + "localstatedir=/tmp/var"))) (add-after 'install 'wrap-libvirtd (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) |