ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 14:16:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: virt-manager: Update to 3.2.0.

Browse source 
* gnu/packages/virtualization.scm (virt-manager): Update to 3.2.0.
[arguments]: Remove #:test-target.  Remove fix-qemu-img-reference phase.
Adapt check phase to use pytest, although they still do not run.
[native-inputs]: Add python-docutils.  Suggest adding python-pytest to enable
tests.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Pierre Langlois 2021-03-20 21:31:25 +00:00 committed by Ludovic Courtès
parent 7573ab22d7
commit 5eb05ede0b
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/virtualization.scm
View file

@ -1230,7 +1230,7 @@ (define-public python2-libvirt
(define-public virt-manager (define-public virt-manager
(package (package
(name "virt-manager") (name "virt-manager")
(version "2.2.1") (version "3.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://virt-manager.org/download/sources" (uri (string-append "https://virt-manager.org/download/sources"
@ -1238,11 +1238,10 @@ (define-public virt-manager
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g")))) "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:use-setuptools? #f ; uses custom distutils 'install' command `(#:use-setuptools? #f ; uses custom distutils 'install' command
#:test-target "test_ui"
#:tests? #f ; TODO The tests currently fail #:tests? #f ; TODO The tests currently fail
; RuntimeError: Loop condition wasn't ; RuntimeError: Loop condition wasn't
; met ; met
@ -1260,12 +1259,6 @@ (define-public virt-manager
(substitute* "virtinst/buildconfig.py" (substitute* "virtinst/buildconfig.py"
(("/usr") (assoc-ref outputs "out"))) (("/usr") (assoc-ref outputs "out")))
#t)) #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 (add-after 'unpack 'fix-default-uri
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Xen is not available for now - so only patch qemu. ;; Xen is not available for now - so only patch qemu.
@ -1296,11 +1289,12 @@ (define-public virt-manager
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(setenv "HOME" "/tmp") (setenv "HOME" "/tmp")
(setenv "XDG_CACHE_HOME" "/tmp")
(system "Xvfb :1 &") (system "Xvfb :1 &")
(setenv "DISPLAY" ":1") (setenv "DISPLAY" ":1")
;; Dogtail requires that Assistive Technology support be enabled ;; Dogtail requires that Assistive Technology support be enabled
(setenv "GTK_MODULES" "gail:atk-bridge") (setenv "GTK_MODULES" "gail:atk-bridge")
(invoke "dbus-run-session" "--" "python" "setup.py" "test_ui")) (invoke "dbus-run-session" "--" "pytest" "--uitests"))
#t)) #t))
(add-after 'install 'glib-or-gtk-compile-schemas (add-after 'install 'glib-or-gtk-compile-schemas
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
@ -1330,7 +1324,9 @@ (define-public virt-manager
("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache
("perl" ,perl) ; pod2man ("perl" ,perl) ; pod2man
("intltool" ,intltool) ("intltool" ,intltool)
("rst2man" ,python-docutils)
;; The following are required for running the tests ;; The following are required for running the tests
;; ("python-pytest" ,python-pytest)
;; ("python-dogtail" ,python-dogtail) ;; ("python-dogtail" ,python-dogtail)
;; ("xvfb" ,xorg-server-for-tests) ;; ("xvfb" ,xorg-server-for-tests)
;; ("dbus" ,dbus) ;; ("dbus" ,dbus)