diff options
| author | Pierre Langlois <pierre.langlois@gmx.com> | 2021-04-01 22:50:43 +0100 |
|---|---|---|
| committer | Pierre Langlois <pierre.langlois@gmx.com> | 2021-04-02 09:21:15 +0100 |
| commit | d01837ca0d1f2805a119571dfab436726157eeac (patch) | |
| tree | 0539b9338e65cbc567c4a19c4a0b45f595661679 /gnu/packages/virtualization.scm | |
| parent | b1ed32dae06fdc0bc50fc69cc7c9e836ecc6a4e3 (diff) | |
| download | guix-patches-d01837ca0d1f2805a119571dfab436726157eeac.tar guix-patches-d01837ca0d1f2805a119571dfab436726157eeac.tar.gz | |
Revert "gnu: virt-manager: Update to 3.2.0."
This reverts commit 5eb05ede0bf0cfe3080a24eea783f0fbc2ed4015.
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index ab7d8deec6..8fcdb660ce 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1230,7 +1230,7 @@ virtualization library.") (define-public virt-manager (package (name "virt-manager") - (version "3.2.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (string-append "https://virt-manager.org/download/sources" @@ -1238,10 +1238,11 @@ virtualization library.") version ".tar.gz")) (sha256 (base32 - "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb")))) + "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g")))) (build-system python-build-system) (arguments `(#:use-setuptools? #f ; uses custom distutils 'install' command + #:test-target "test_ui" #:tests? #f ; TODO The tests currently fail ; RuntimeError: Loop condition wasn't ; met @@ -1259,6 +1260,12 @@ virtualization library.") (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. @@ -1289,12 +1296,11 @@ virtualization library.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (setenv "HOME" "/tmp") - (setenv "XDG_CACHE_HOME" "/tmp") (system "Xvfb :1 &") (setenv "DISPLAY" ":1") ;; Dogtail requires that Assistive Technology support be enabled (setenv "GTK_MODULES" "gail:atk-bridge") - (invoke "dbus-run-session" "--" "pytest" "--uitests")) + (invoke "dbus-run-session" "--" "python" "setup.py" "test_ui")) #t)) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) @@ -1324,9 +1330,7 @@ virtualization library.") ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("perl" ,perl) ; pod2man ("intltool" ,intltool) - ("rst2man" ,python-docutils) ;; The following are required for running the tests - ;; ("python-pytest" ,python-pytest) ;; ("python-dogtail" ,python-dogtail) ;; ("xvfb" ,xorg-server-for-tests) ;; ("dbus" ,dbus) |