From patchwork Sat Mar 20 21:31:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 27991 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1D78527BC57; Sat, 20 Mar 2021 21:32:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D6E4F27BC5D for ; Sat, 20 Mar 2021 21:32:16 +0000 (GMT) Received: from localhost ([::1]:36496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNjCh-0007Mf-VJ for patchwork@mira.cbaines.net; Sat, 20 Mar 2021 17:32:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNjCW-0007JM-Ew for guix-patches@gnu.org; Sat, 20 Mar 2021 17:32:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lNjCV-0002iy-KQ for guix-patches@gnu.org; Sat, 20 Mar 2021 17:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lNjCV-0004sZ-HO for guix-patches@gnu.org; Sat, 20 Mar 2021 17:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47285] [PATCH 4/4] gnu: virt-manager: Update to 3.2.0. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Mar 2021 21:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47285 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47285@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 47285-submit@debbugs.gnu.org id=B47285.161627590918710 (code B ref 47285); Sat, 20 Mar 2021 21:32:03 +0000 Received: (at 47285) by debbugs.gnu.org; 20 Mar 2021 21:31:49 +0000 Received: from localhost ([127.0.0.1]:53232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjCH-0004rd-5j for submit@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:49 -0400 Received: from mout.gmx.net ([212.227.17.21]:54717) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjC5-0004qk-Ej for 47285@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1616275891; bh=xrD/3IoQ7MUjHWt32zXxomN6ZStS4QFpYbEHiTnTqVE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=D+rtv1nfiQsyg6RRDsuYEp/JXEClZ8zFcfiXJnDsEDuq9QiSerI+EJcOC1JUo+zEZ 5WnweqphzVD2HdJ3plgpXwZ4aUZ5cqvxipiHePks1xz4OhpVPBg6sL0TdyuuBvxXen P9BfQY5LrbdqQbGycM/5ZNJRSpWr3ZBuht83f4yI= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MwfWU-1lcek52m8w-00y7ie; Sat, 20 Mar 2021 22:31:31 +0100 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:25 +0000 Message-Id: <20210320213125.11295-4-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210320213125.11295-1-pierre.langlois@gmx.com> References: <87o8fdwmdn.fsf@gmx.com> <20210320213125.11295-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:jcwIuNKbuidbFzfHkKH05gyjY2Hbcn5GhehsUQDmZ4VaGcqToWH NCi5nFdmTu4z2+tK2FKZ2YzGffqmZigeHVySec2RZ8FZyqI8TEXMXLL8w6BZoZXSlHsDKj8 iWO0uMVW5kJyr+UCHml+E3/SKrfSdABFxrxY24YTtWe51AtvRYNqoQimUTd4/BpY6t+Q6Bk jeMEl6abqPP0AMFSqk+ug== X-UI-Out-Filterresults: notjunk:1;V03:K0:FAGapktN+UU=:fthfY95hD7ArSqMCVGHhUx AlGrBnkhO2RzECc9RSnNIY4SOUDDD4DTh0muiJBPxfypQ+bbWCsH8OuWWs9ByWCheif0irHPq nglrw9u/Co1/qoLs6hAevD77kaEh1OD1DW2FN9wWYXwQAmlPgAc1oqrP/c7e1ZAfkw3FjJNom C15RrYJFWzpc9GtDvC6CHo0DthDt+39Ux6JZFf8GdchS9wb8XI8Grdu074kbR81aKpJu2NImY m4TDF68XxCeiCBCw5hqyhVXjg8fqduC3uJ3e5f3wzRkyHY8eknnOqySTosWbruY0dqqtUFU19 4UeLGx11iwS7HHuHA5K1QmlE1svePLpoGBo13JuU0O9YK4a+88qJfocz4jQhIj6ykMLVLI/QB fPFK9Hu9BopPJ02S4q9OBqByZAYGcry8WnCx74ELlmSX9Mn5qabdpJyaSF9cQ/CMohm2opCn3 Y8PWq5/AW+oOA1/871x1uN9C+FFJtuUPzIdZywaVy1Kyj+pqTujJJBCtLXB+GJMEiGIqzs5Ub S+ev67X9IQhzGTC50lbK940Dk0JakSAx+U5wMdm3RHWsQ1lviScDkf8uOhdUAbKlHjfIkgMb9 Aq9uP8uIKsSr02OUcB4QAg6vq5BxiBvEGEy4cxmNJfDo/GTR4ZMUC+8MPAah2Lud4xVqYIbDb CkDgA2iEpB7mdx5IBFRDZ/c3mbz/sFQ5tgMKEAfC5s++MeanXWfHRQrskJdCvuvLnWvMu/5gb pIIc+OrgfxOP4Fsc+7pZ7tXG7JFK1b0vogD2PcMdvQChM1+uSiwSGz/ieJJwuc4dce/XWKfDK vKS632wO92HHyXYy8K20Ede+YG5D5N+F3juBgo16kMgXk9glpxekU+KhMKiCwuUwY8rBzBMdd iSRoou0bpubfZH+6aj6Q== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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(-) -- 2.31.0 diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 97ca1fa0c8..1df559aa5a 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 "2.2.1") + (version "3.2.0") (source (origin (method url-fetch) (uri (string-append "https://virt-manager.org/download/sources" @@ -1238,11 +1238,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 @@ -1260,12 +1259,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. @@ -1296,11 +1289,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)) @@ -1330,7 +1324,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)