diff options
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 56 |
1 files changed, 38 insertions, 18 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 93e1cb5ec5..904b4e1755 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -114,7 +114,16 @@ version ".tar.xz")) (sha256 (base32 - "1ih9v6gxgild3m4g80ld4dr3wp9db3bpy203k73fxgc9hqhn0vk5")))) + "1ih9v6gxgild3m4g80ld4dr3wp9db3bpy203k73fxgc9hqhn0vk5")) + (patches + (list + ;; Fix an ordering issue with recent kernels, see + ;; <https://bugs.gnu.org/37860>. + (qemu-patch + "bf9e0313c27d8e6ecd7f7de3d63e1cb25d8f6311" + "qemu-tests-make-filemonitor-test-more-robust.patch" + (base32 + "1242wqpr8id3cn88pzbig3sqh4znml0g0h2mwdmdyhp81blq7s7n")))))) (build-system gnu-build-system) (arguments '(;; Running tests in parallel can occasionally lead to failures, like: @@ -400,14 +409,16 @@ manage system or application containers.") (define-public libvirt (package (name "libvirt") - (version "5.6.0") + (version "5.8.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (sha256 - (base32 "1d5rmcx5fgb024hw8chbiv886n3jal5wp2yajjk5l4qh9s9gkx35")))) + (base32 "0m8cqaqflvys5kaqpvb0qr4k365j09jc5xk6x70yvg8qkcl2hcz2")) + (patches + (search-patches "libvirt-create-machine-cgroup.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -439,6 +450,8 @@ manage system or application containers.") (add-before 'configure 'disable-broken-tests (lambda _ (let ((tests (list "commandtest" ; hangs idly + "qemuxml2argvtest" ; fails + "qemuhotplugtest" ; fails "virnetsockettest" ; tries to network "virshtest"))) ; fails (substitute* "tests/Makefile.in" @@ -480,7 +493,7 @@ manage system or application containers.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("polkit" ,polkit) - ("python" ,python))) + ("python" ,python-wrapper))) (home-page "https://libvirt.org") (synopsis "Simple API for virtualization") (description "Libvirt is a C toolkit to interact with the virtualization @@ -534,15 +547,14 @@ three libraries: (define-public python-libvirt (package (name "python-libvirt") - (version "5.6.0") + (version "5.8.0") (source (origin (method url-fetch) - ;; The latest version hosted on PyPI at 5.6.0 release time was 5.5.0. (uri (string-append "https://libvirt.org/sources/python/libvirt-python-" version ".tar.gz")) (sha256 - (base32 "11i440aibykxw22fzyavmrvn67s8rmnijw5bag0yx9r8jpnkzwad")))) + (base32 "0kyz3lx49d8p75mvbzinxc1zgs8g7adn77y9bm15b8b4ad9zl5s6")))) (build-system python-build-system) (arguments `(#:phases @@ -574,7 +586,7 @@ virtualization library.") (define-public virt-manager (package (name "virt-manager") - (version "2.1.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (string-append "https://virt-manager.org/download/sources" @@ -582,7 +594,7 @@ virtualization library.") version ".tar.gz")) (sha256 (base32 - "1m038kyngmxlgz91c7z8g73lb2wy0ajyah871a3g3wb5cnd0dsil")))) + "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g")))) (build-system python-build-system) (arguments `(#:use-setuptools? #f ; uses custom distutils 'install' command @@ -600,13 +612,19 @@ virtualization library.") (modify-phases %standard-phases (add-after 'unpack 'fix-setup (lambda* (#:key outputs #:allow-other-keys) - (substitute* "virtcli/cliconfig.py" + (substitute* "virtinst/buildconfig.py" (("/usr") (assoc-ref outputs "out"))) #t)) + (add-after 'unpack 'fix-qemu-img-reference + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "virtconv/formats.py" + (("/usr(/bin/qemu-img)" _ suffix) + (string-append (assoc-ref inputs "qemu") suffix))) + #t)) (add-after 'unpack 'fix-default-uri (lambda* (#:key inputs #:allow-other-keys) ;; Xen is not available for now - so only patch qemu. - (substitute* "virtManager/connect.py" + (substitute* "virtManager/createconn.py" (("/usr(/bin/qemu-system)" _ suffix) (string-append (assoc-ref inputs "qemu") suffix))) #t)) @@ -637,6 +655,7 @@ virtualization library.") `(("dconf" ,dconf) ("gtk+" ,gtk+) ("gtk-vnc" ,gtk-vnc) + ("gtksourceview" ,gtksourceview) ("libvirt" ,libvirt) ("libvirt-glib" ,libvirt-glib) ("libosinfo" ,libosinfo) @@ -787,13 +806,14 @@ mainly implemented in user space.") (name "qmpbackup") (version "0.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/abbbi/qmpbackup/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/abbbi/qmpbackup.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "10k9mnb1yrg4gw1rvz4kw4dxc4aajl8gnjrpm3axqkg63qmxj3qn")) - (file-name (string-append name "-" version ".tar.gz")))) + "0swhp5byz44brhyis1a39p11fyn9q84xz5q6v2fah29r7d71kmmx")))) (build-system python-build-system) (arguments `(#:python ,python-2)) @@ -982,7 +1002,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") (define-public skopeo (package (name "skopeo") - (version "0.1.39") + (version "0.1.40") (source (origin (method git-fetch) (uri (git-reference @@ -991,7 +1011,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") (file-name (git-file-name name version)) (sha256 (base32 - "1jkxmvh079pd9j4aa39ilmclwafnjs0yqdiigwh8cj7yf97x4vsi")))) + "1bagirzdzjhicn5dr691092ac3q6lhz3xngjzgqiqkxnvpz7p6cn")))) (build-system go-build-system) (native-inputs `(("pkg-config" ,pkg-config))) |