unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Pierre Langlois <pierre.langlois@gmx.com>
To: 46623@debbugs.gnu.org
Cc: Pierre Langlois <pierre.langlois@gmx.com>
Subject: [bug#46623] [PATCH 6/6] gnu: virt-manager: Update to 3.2.0.
Date: Fri,  2 Apr 2021 12:59:02 +0100	[thread overview]
Message-ID: <20210402115902.3474-6-pierre.langlois@gmx.com> (raw)
In-Reply-To: <20210402115902.3474-1-pierre.langlois@gmx.com>

* 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.
---
 gnu/packages/virtualization.scm | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index e8540762ee..ada23d2aa9 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1236,7 +1236,7 @@ virtualization library.")
 (define-public virt-manager
   (package
     (name "virt-manager")
-    (version "2.2.1")
+    (version "3.2.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://virt-manager.org/download/sources"
@@ -1244,11 +1244,10 @@ virtualization library.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g"))))
+                "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb"))))
     (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
@@ -1266,12 +1265,6 @@ 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.
@@ -1302,11 +1295,12 @@ 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" "--" "python" "setup.py" "test_ui"))
+               (invoke "dbus-run-session" "--" "pytest" "--uitests"))
              #t))
          (add-after 'install 'glib-or-gtk-compile-schemas
            (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
@@ -1336,7 +1330,9 @@ 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)
--
2.31.1





  parent reply	other threads:[~2021-04-02 12:00 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-18 20:24 [bug#46623] [PATCH 0/4] gnu: libvirt: Update to 7.0.0 Brice Waegeneire
2021-02-18 20:48 ` [bug#46623] [PATCH 1/4] gnu: libvirt: Enable disk and directory storage Brice Waegeneire
2021-02-18 20:48 ` [bug#46623] [PATCH 2/4] services: libvirt: Change unix-sock-group default Brice Waegeneire
2021-02-18 20:48 ` [bug#46623] [PATCH 3/4] services: libvirt: Add qemu field Brice Waegeneire
2021-02-18 20:48 ` [bug#46623] [PATCH 4/4] gnu: libvirt: Update to 7.0.0 Brice Waegeneire
2021-04-02 11:56   ` Pierre Langlois
2021-04-02 11:58     ` [bug#46623] [PATCH 1/6] tests: libvirt: Catch issues with incorrect /var and /etc in package Pierre Langlois
2021-04-02 11:58       ` [bug#46623] [PATCH 2/6] gnu: libvirt: Enable disk and directory storage Pierre Langlois
2021-04-02 11:58       ` [bug#46623] [PATCH 3/6] gnu: libvirt: Update to 7.2.0 Pierre Langlois
2021-04-02 11:59       ` [bug#46623] [PATCH 4/6] gnu: python-libvirt: " Pierre Langlois
2021-04-02 11:59       ` [bug#46623] [PATCH 5/6] gnu: libvirt-glib: Update to 4.0.0 Pierre Langlois
2021-04-02 11:59       ` Pierre Langlois [this message]
2021-04-05 16:37     ` [bug#46623] [PATCH 0/4] gnu: libvirt: Update to 7.0.0 Ludovic Courtès
2021-04-05 18:52       ` Pierre Langlois
2021-04-01 20:29 ` bug#46623: " Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210402115902.3474-6-pierre.langlois@gmx.com \
    --to=pierre.langlois@gmx.com \
    --cc=46623@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).