From patchwork Sat Mar 20 21:31:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 27992 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 976E527BC57; 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=unavailable 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 D639327BC5C for ; Sat, 20 Mar 2021 21:32:15 +0000 (GMT) Received: from localhost ([::1]:36398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNjCh-0007Jz-0N for patchwork@mira.cbaines.net; Sat, 20 Mar 2021 17:32:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNjCV-0007In-Kq for guix-patches@gnu.org; Sat, 20 Mar 2021 17:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41687) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lNjCU-0002iW-P3 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 1lNjCU-0004sK-M6 for guix-patches@gnu.org; Sat, 20 Mar 2021 17:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47285] [PATCH 1/4] gnu: libvirt: Update to 7.1.0. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Mar 2021 21:32:02 +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.161627590818697 (code B ref 47285); Sat, 20 Mar 2021 21:32:02 +0000 Received: (at 47285) by debbugs.gnu.org; 20 Mar 2021 21:31:48 +0000 Received: from localhost ([127.0.0.1]:53228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjCG-0004rN-8J for submit@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:48 -0400 Received: from mout.gmx.net ([212.227.17.22]:58087) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjC3-0004qd-97 for 47285@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1616275888; bh=PjB6VlbNrEWGsIV7ofNL826dHiwfGUh7QX1i0IlNy9w=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=IzhGRO0/wSQw4Jy5EVDc+E9/Ky6sih9uos4XttwSBT2FTdauHTzDuNQcmkH5/Z4nn ItWIFmjZC7eM2Phf9pIGR+9nsJPQGjvvWvcXoFuzjyfNlRTLDx1rJWTvg4OoU6bhbx lyvacWIrg0L2OB9SLVqefP44oHte6d+5tIe2Ngoc= 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 1MS3mt-1lGk7X13pD-00TRoT; Sat, 20 Mar 2021 22:31:28 +0100 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:22 +0000 Message-Id: <20210320213125.11295-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <87o8fdwmdn.fsf@gmx.com> References: <87o8fdwmdn.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Xq2A1Igjr+FKbJEkQdh4mhAQhD745Id4+ljJ7r/xyR4Q4cJBkQb 4uzZkgsSEuljbOt3yINSqT4zqFRQOX8+1bMw9PWqSim1+/C/WDCsjV12xkDYKguEq1yDt+d +SBs/8Wxa0CiZF1++KO5FtG+LKusOAHPHI2nMWBJHOwWrHPt8GsFOHwNmyh1NWhLQP7GclJ JJe6KGmdEranuz3e9/w3w== X-UI-Out-Filterresults: notjunk:1;V03:K0:FbhrL3kWqQQ=:Jhz2xS0ZU8VKGEbRpJVEmA ziysGeDzQbdIuCWO6majY+WVaLBRh2eSjjWjAgv1hLVGR67Y3tTPiVWPN2xaIpL81VzCmRb3h cd2gM26cU+qbqBs65NwzST8sS+Sve65+AX0d3PX1gHXusM9Wx6t1o9OVvRgRXOtlVK/FmN7rA 0ETa577VgCCJk2e/QD0m0oKtGn//Jp+ZdWmZnz3EWn1lYXjak83TSnmuhCu7GgAVI6kv4mobh wylcfmaDKbcFmhKElDq1iEzAwacdcb1wyIOF/94mm2ji3EP2aNb0v3aBR/jvbMSfD7HLu0dYV jy5PJyjhCiQw/TOlGFPHNS/BMYwElaQDXFHfTY9HFzlKrPop1VhpSrFeyeG6cCWLVsH79Ug23 7uog/czi5SpCgHenIM4oY81mom1Ir4CfZN3GquWcNKBKanPJQWq844g6IECJb3Fcy4+z1rG2v bFttUBotUMi3DT0JxZ5YkV5GrZ7GjFwHlRmoxFebafTFsyQOqvLgtUttc73NngWa1of/bk+wp Syuu9L9na9L8yhG2YwuoE2ykEk2FQ4pNXhyit6nexQdhLtzuNfAGlqZFEKVu+qTwccdrDWFeM 0i0ttiHJXGBa4w63rAvlbNEBYWupeLmTzYh8XeTcJt1VhScReXcS7oQdgcAYot6xsODnMtthV 6g/GBBDHfbYjMwNM3T6avkt+ZNDX4p0HrfXkgD4A03Du++w6ABMpCNCDdSBshJn+T5ysM6JvE CmdvtGdLMOJmkhWGoV8aPvGFuAkZ6lVuHiEvWR2BB3ajokCRdDwOxADTdAlq8xreXRUu7nY+x WbYW9rWjFX2oXNyzE6nQEAFFjZ++GRc4LHtXn7F0LbIQKo86WW2rWAb7WDogqpMEXT5bUiobq vdBCap6jj63ehHerkR7Q== 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 (libvirt): Update to 7.1.0. [source]: Remove libvirt-create-machine-cgroup.patch, add libvirt-do-not-create-var-dirs.patch. [build-system]: Switch to meson-build-system. [arguments]: Use meson-0.55. Adapt #:configure-flags for meson, there is no need for --docdir anymore. Remove fix-BOURNE_SHELL-definition phase. Add fix-sysconfdir-and-localstatedir phase. Adapt disable-broken-tests to meson. [native-inputs]: Add python-docutils and rpcsvc-proto. * gnu/packages/patches/libvirt-create-machine-cgroup.patch: Delete. * gnu/packages/patches/libvirt-do-not-create-var-dirs.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add new patch, remove the other. --- gnu/local.mk | 2 +- .../libvirt-create-machine-cgroup.patch | 48 ------------ .../libvirt-do-not-create-var-dirs.patch | 30 +++++++ gnu/packages/virtualization.scm | 78 ++++++++----------- 4 files changed, 64 insertions(+), 94 deletions(-) delete mode 100644 gnu/packages/patches/libvirt-create-machine-cgroup.patch create mode 100644 gnu/packages/patches/libvirt-do-not-create-var-dirs.patch -- 2.31.0 diff --git a/gnu/local.mk b/gnu/local.mk index 3d4147a879..cd755f5d67 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1257,7 +1257,7 @@ dist_patch_DATA = \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ - %D%/packages/patches/libvirt-create-machine-cgroup.patch \ + %D%/packages/patches/libvirt-do-not-create-var-dirs.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ diff --git a/gnu/packages/patches/libvirt-create-machine-cgroup.patch b/gnu/packages/patches/libvirt-create-machine-cgroup.patch deleted file mode 100644 index 585ac237e1..0000000000 --- a/gnu/packages/patches/libvirt-create-machine-cgroup.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9ca0b2955edea162b255b428e493cd8ffac52167 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= - -Date: Fri, 1 Nov 2019 17:29:00 +0100 -Subject: [PATCH] vircgroup: Ensure /machine group is associated with its - parent. - -Call first virCgroupNew on the parent group virCgroupNewPartition if -it is available on before the creation of the child group. This -ensures that the creation of a first level group on the unified -architecture, as the check at virCgroupV2ParseControllersFile as the -parent file is there. - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1760233 ---- - src/util/vircgroup.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c -index b46f20abfd..33c61f2d45 100644 ---- a/src/util/vircgroup.c -+++ b/src/util/vircgroup.c -@@ -855,9 +855,6 @@ virCgroupNewPartition(const char *path, - if (virCgroupSetPartitionSuffix(path, &newPath) < 0) - goto cleanup; - -- if (virCgroupNew(-1, newPath, NULL, controllers, group) < 0) -- goto cleanup; -- - if (STRNEQ(newPath, "/")) { - char *tmp; - parentPath = g_strdup(newPath); -@@ -868,7 +865,12 @@ virCgroupNewPartition(const char *path, - - if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0) - goto cleanup; -+ } - -+ if (virCgroupNew(-1, newPath, parent, controllers, group) < 0) -+ goto cleanup; -+ -+ if (parent) { - if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0) - goto cleanup; - } --- -2.23.0 - diff --git a/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch b/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch new file mode 100644 index 0000000000..640cb1696d --- /dev/null +++ b/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch @@ -0,0 +1,30 @@ +We define localstatedir as /var, and so we shouldn't be installing empty +directories there. + +diff --git a/src/meson.build b/src/meson.build +index f13b85b74e..58040f2c5d 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -893,22 +893,6 @@ if conf.has('WITH_DTRACE_PROBES') + ) + endif + +- +-# Install empty directories +- +-virt_install_dirs += [ +- localstatedir / 'cache' / 'libvirt', +- localstatedir / 'lib' / 'libvirt' / 'images', +- localstatedir / 'lib' / 'libvirt' / 'filesystems', +- localstatedir / 'lib' / 'libvirt' / 'boot', +-] +- +-meson.add_install_script( +- meson_python_prog.path(), python3_prog.path(), meson_install_dirs_prog.path(), +- virt_install_dirs, +-) +- +- + # Check driver files + + if host_machine.system() == 'linux' diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index fabac5b984..86a95b77f1 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Leo Famulari +;;; Copyright © 2021 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -1065,64 +1066,49 @@ manage system or application containers.") (define-public libvirt (package (name "libvirt") - (version "5.8.0") + (version "7.1.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (sha256 - (base32 "0m8cqaqflvys5kaqpvb0qr4k365j09jc5xk6x70yvg8qkcl2hcz2")) + (base32 "0v50ckf56h6jd9bmqwp0lh2cmb7qqjmcb6y3mz2i2r15h06ih3w7")) (patches - (search-patches "libvirt-create-machine-cgroup.patch")))) - (build-system gnu-build-system) + (search-patches "libvirt-do-not-create-var-dirs.patch")))) + (build-system meson-build-system) (arguments - `(#:configure-flags - (list "--with-qemu" - "--with-qemu-user=nobody" - "--with-qemu-group=kvm" - "--with-polkit" - (string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/" - ,name "-" ,version) - "--sysconfdir=/etc" - "--localstatedir=/var") + `(#:meson ,meson-0.55 ;; libvirt requires meson 0.54 or higher. + #:configure-flags + (list "-Ddriver_qemu=enabled" + "-Dqemu_user=nobody" + "-Dqemu_group=kvm" + "-Dpolkit=enabled") #:phases (modify-phases %standard-phases - (add-before 'configure 'fix-BOURNE_SHELL-definition - ;; BOURNE_SHELL is hard-#defined to ‘/bin/sh’, causing test failures. + (add-after 'unpack 'fix-sysconfdir-and-localstatedir (lambda _ - (substitute* "config.h.in" - (("/bin/sh") (which "sh"))) - #t)) - (add-before 'configure 'patch-libtirpc-file-names - (lambda* (#:key inputs #:allow-other-keys) - ;; libvirt uses an m4 macro instead of pkg-config to determine where - ;; the RPC headers are located. Tell it to look in the right place. - (substitute* "configure" - (("/usr/include/tirpc") ;defined in m4/virt-xdr.m4 - (string-append (assoc-ref inputs "libtirpc") - "/include/tirpc"))) + (substitute* "meson.build" + ;; We set the prefix to be the package output, but we need + ;; localstatedir to be /var. Sadly the build system doesn't + ;; seem to allow that easily. + (("localstatedir = prefix / get_option\\('localstatedir'\\)") + "localstatedir = get_option('localstatedir')") + ;; On the other hand, we keep sysconfdir using the prefix so + ;; that we install configuration files in the package output. + ;; However, we need to make sure the C code refers to /etc via + ;; SYSCONFDIR, and not the read-only configuration in the + ;; package output. + (("set_quoted\\('SYSCONFDIR', sysconfdir\\)") + "set_quoted('SYSCONFDIR', '/etc')")) #t)) (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" - (((format #f "(~a)\\$\\(EXEEXT\\)" (string-join tests "|"))) - "")) - #t))) - (replace 'install - ;; Since the sysconfdir and localstatedir should be /etc and /var - ;; at runtime, we must prevent writing to them at installation - ;; time. - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "install" - "sysconfdir=/tmp/etc" - "localstatedir=/tmp/var" - make-flags)))))) + (substitute* "tests/meson.build" + (("\\{ 'name': 'commandtest'.*") "") ; hangs idly + (("\\{ 'name': 'qemuxml2argvtest'.*") "") ; fails + (("\\{ 'name': 'virnetsockettest'.*") "")) ; tries to network + #t))))) (inputs `(("libxml2" ,libxml2) ("eudev" ,eudev) @@ -1149,7 +1135,9 @@ manage system or application containers.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("polkit" ,polkit) - ("python" ,python-wrapper))) + ("python" ,python-wrapper) + ("python-docutils" ,python-docutils) ;for rst2html + ("rpcsvc-proto" ,rpcsvc-proto))) ;for 'rpcgen' (home-page "https://libvirt.org") (synopsis "Simple API for virtualization") (description "Libvirt is a C toolkit to interact with the virtualization From patchwork Sat Mar 20 21:31:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 27993 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 A914127BC58; Sat, 20 Mar 2021 21:32:40 +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=unavailable 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 82CEC27BC57 for ; Sat, 20 Mar 2021 21:32:40 +0000 (GMT) Received: from localhost ([::1]:37948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNjD5-0007y7-OU for patchwork@mira.cbaines.net; Sat, 20 Mar 2021 17:32:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNjCU-0007IE-NP for guix-patches@gnu.org; Sat, 20 Mar 2021 17:32:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lNjCU-0002iC-Dd for guix-patches@gnu.org; Sat, 20 Mar 2021 17:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lNjCU-0004sD-9i for guix-patches@gnu.org; Sat, 20 Mar 2021 17:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47285] [PATCH 2/4] gnu: python-libvirt: Update to 7.1.0. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Mar 2021 21:32:02 +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.161627590818688 (code B ref 47285); Sat, 20 Mar 2021 21:32:02 +0000 Received: (at 47285) by debbugs.gnu.org; 20 Mar 2021 21:31:48 +0000 Received: from localhost ([127.0.0.1]:53225 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjC5-0004r5-IH for submit@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:48 -0400 Received: from mout.gmx.net ([212.227.17.20]:50755) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjC3-0004qf-MU for 47285@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1616275889; bh=NdyNkQZFKASvGrpEEh3p2jEpI3tkSnaM4RBjgkY6VqQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=bpY1+rTWqsZLLshU9KoEw4hApXpXw5uc1GWSbUuWAHxLoFEZ/dlj7FTEdYgonqL7p 8J01kf5KtJaP1ENz60N9sJuUtVskM9RA+Ji/M6XF/o6cZ7wTUSeQh7xJ0dKDqLPAGz qbXC0qkNnkO+fjJX6on3OiJVze9bfWXXZFu6pKmE= 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 1MBDj4-1lX2aN22gA-00Cjm4; Sat, 20 Mar 2021 22:31:29 +0100 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:23 +0000 Message-Id: <20210320213125.11295-2-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:dR9j1YG5QwxJ6HwxnSlWmkocFsLXTLELd7PFAvJgtMmkJo472aA sQaiII/NGM4evXX7rszcK4pstxEgrHwu4JAkDECh6voCgJoqGfN1BKsSqNyuZAbKxnGHxtO MokaVPksEMoR+zTq8O3NRjbwbAS7a5YvxrLgSz9tlbvNSiyPVJ78S2kqtU7L3xeAvF7d33O SMTnOVf+SgmWvv8SnkpVA== X-UI-Out-Filterresults: notjunk:1;V03:K0:KaXfUtLOTlI=:nD3xvrjKdAO1IWjqy/UM3T ghJlV5l3Rtcr0q39UFUmrbX9as5fDikZlxAmd+flQOzWHIuUIuJEy9vdB3ogrtpmaLGnm28vP bnBgYNYGUFbb4zcjXdU8+bxqDDxGu19U9VvULksy8rsQf9TqkM7BK9pXN+JEcRX4/YQ94ojWN rbckKrOWNHtQ+a+w2ve47vWt5ScYyIeT8R9mynca04C2R945ezyTj+jIGZrgSj67XfcHm9Kxk EoLiXPBkOEI+udNQh6HJp9OvuIF7klkN0J1Saqcb/rqSbucige8ue4TaZWhwsxkdNyQ2w3O89 JhO101sV/vT5uhRGIU9Md19Kt9b+DQt8qR+0A0eAFXMf1A5Azq594/osM3EMqCEPGpEIAu4Un UiyZIWI1kzkU48a6MjL1K0H99Akmc8qH0HGtwcypGiiVMCjPkSYfkt5RtPU1PmczrVffXD9aG 5bIxENOKrjYswrgGcnZgFbZbNlPfYLhOQVk0VRkZLhzGMf9RQr/h04UJzQNkAyGccCveaHTzh lkgr4FkkFvTBwaiZNYL2Os7KZI2p4rU7J9+GtlgQUAPQqp6iX50oj7Rfh0+160MYfgSneJ8TG be2YDE8mDMMywFosQLoZqdwRMB1+FG7LNONOtsYwUK1722/0kkaqpAb6JpecEk2c4LAkaGiZR ijTBAuLt6eWofaq0lWnuYtH0t7XRWxZO12UtpJHKaFzMwiC77R8Hvib5uVz4sVvMp7CludT3g ex+sog4kGw/Eu4pX9FGXuH/m4OZJ851UCjHlVWlEmGKqpFJtKFwLaVUjP2pMdqn4Ec7nxY1Pt KF7lNmiKWUhQteHjJKJDx1WRiTx8Rvk1i8PfK63l2zbeBhefOEK1LXt7hUMw3cdvlvPWm6UyY VmbK8sNOvFLc4u7EilTbhMnzskwgWEYoriw3v+iV86xmIlBpQdmtH25DIBS2dxUsMSoB19HIo 5GlCGFeyfqnZbGlWqH4F8S2zKnjxAE5gSziiq/FtuSrlLuEdbgmS57QWUfWfWT9DymOJ9KWzj mC1WlyCSoupTsbzAJwO6FQF5NTpK9oXU0VjiMDpd5u7OEMl9cotw0Xf2SKlnQ4AUZH9nri+0Y n6eLcxknusD64Qao+MPpxxFq5jI37eviYrBUEP8cT6gBo0R7dtd5J1D78B7BzyEqGI8l3jpTp AHxNhpH84ABixHKVvsgpjhV1iy5Km4khKuIqAVAuFistuDSCKhaESYSLSGPAFMfOvEv2QrWki w1+wH+R9fYy/SmTcu 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 (python-libvirt): Update to 7.1.0. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.31.0 diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 86a95b77f1..399cfb544a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1191,14 +1191,14 @@ three libraries: (define-public python-libvirt (package (name "python-libvirt") - (version "5.8.0") + (version "7.1.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/python/libvirt-python-" version ".tar.gz")) (sha256 - (base32 "0kyz3lx49d8p75mvbzinxc1zgs8g7adn77y9bm15b8b4ad9zl5s6")))) + (base32 "0dq0qn0xx5hflaq5apj5pm79ba0wcl3w0j9klx8bg73z80gd7bzs")))) (build-system python-build-system) (arguments `(#:phases From patchwork Sat Mar 20 21:31:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 27990 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 9676B27BC57; Sat, 20 Mar 2021 21:32:17 +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=unavailable 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 A33E427BC5A for ; Sat, 20 Mar 2021 21:32:15 +0000 (GMT) Received: from localhost ([::1]:36406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lNjCg-0007KA-Py for patchwork@mira.cbaines.net; Sat, 20 Mar 2021 17:32:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNjCV-0007Io-K1 for guix-patches@gnu.org; Sat, 20 Mar 2021 17:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41688) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lNjCV-0002io-6g 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-0004sR-3j for guix-patches@gnu.org; Sat, 20 Mar 2021 17:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47285] [PATCH 3/4] gnu: libvirt-glib: Update to 4.0.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.161627590918704 (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]:53230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjCG-0004rW-So for submit@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:49 -0400 Received: from mout.gmx.net ([212.227.17.21]:42529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjC4-0004qi-MR for 47285@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1616275891; bh=CZRrtC44jHLLzDIa4wdh1fzJ9O39IjE2jzb9hFQzgtY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=VrSwKkeVnf5YBLVXtJY8qaeh9rgmcl+SxjglaELG0jccEgS+P8kwpJDoQJIkt/gEN x2QLrES7j82Esk4HYoiK4P1nps0MzUSFVBZW0IH1YTjK0/u8vsfQIl1uacubPaKfgk igBhDQGrkGNqqXxE3hA1SkwxrPOno5IhEwbbbT/Y= 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 1N0X8u-1lZuv035aW-00wTYY; Sat, 20 Mar 2021 22:31:30 +0100 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:24 +0000 Message-Id: <20210320213125.11295-3-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:eM2DoWONzLqXgSpV3RbiTxRemGo2KLY1B766rJ/TWeKVjTl/BIX mKfjuLb5hMfewLokk/Xp+6pWZOmJLEoESZ+A9atpcbtCSWP+ZwjH2oVD92hE+kjJoOu2ATf BOckPyrErRHt87Y4tAQkLBVFf3ziUZIZ7WoehIlK3iTVMQo60T1LWA0jH0P1emqPYgvK9cR Pfo1lxn+YPC83ll3COXDA== X-UI-Out-Filterresults: notjunk:1;V03:K0:MLxkuPmaX9I=:YFsm2Q1Ege4z/ZaXwnbokN j6ywo++O8j2zu2JwK3raHxRjZhFXcsEWFarV7Ej46JL6LEM5u9HMS3maA4Hyf2ebsuXZqDqYa 7WmkBuqGnWnMC4GVpktlH/vTyFeYIAkoOVIHYkvOOKTz/VH0NHzEcoK8EnDjFPoQ/S/9ZEI1v k+4Pivfu4tBHWdc8fuTJFyoE3IAMHhiL3qIIUj/y22xx3X7UqblJgrjhzOdjpXzgYIfkcBJss BsccN3rbm83fVGi9y0Zxh+l+sYHIvq6L1SEtdGmNNnYjuVtRttOJBm12i/Amnmm4td4boerZG KktIWsR1AxB8cfNF/OZAlhHSKYrMQ/YxF/UmKjuDfItGwK91VHI8x9AywqmqzwEKJOIsiyRkc wvwVWCmfDCvTCLx8jQGkZf1WAowCgmdZgVTv4hmGvYdEQ7vRB7Xm79JwfLnCGpt+IZBfLjJQQ 5i1zHxBxw80CM1ngEldYuQOqWY2O3uiZVLBJw/IonSN/KlUk3z6LG/MDaRfbQL5MoEfq3+PCQ /QSl7m5WlJ30sW7OBD3/cCTr6TZmbWY9ZGvS3z5asLh6MCotBc3kLZ5iIY3DOPuF1yuAQ2cYH o4km/onCmHNxqwtIczsevkRNu3zIIfzc+qtufrWX2d8/DjAXl2QQzh5/7OdC2bPWo9sUWfFwM 8ah5vBV3+QPpxGEiPqGhXqOzs0zveenj9Q3aqT2GZWgWIsV+3wdWOpoiNhocezK1V2BqbLg4L SxfrsDzNvywFLkbqxT5PcqEOdAOL+oVrlYXrAHx/soAp0MKklzps/IZAkRCO4JZ23ssrieeZX 3MS8XMQ5lNjZRnj9BrjBxxE7pX+C/DosxKR7lrkAZGzmw6WS9l5FRmWbmRZDQ6LFjyaUcSjca lGbWkxvLGHOMUP0QbCyw== 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 (libvirt-glib): Update to 4.0.0. [build-system]: Switch to meson-build-system. --- gnu/packages/virtualization.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.31.0 diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 399cfb544a..97ca1fa0c8 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1149,15 +1149,15 @@ to integrate other virtualization mechanisms if needed.") (define-public libvirt-glib (package (name "libvirt-glib") - (version "3.0.0") + (version "4.0.0") (source (origin (method url-fetch) (uri (string-append "ftp://libvirt.org/libvirt/glib/" - "libvirt-glib-" version ".tar.gz")) + "libvirt-glib-" version ".tar.xz")) (sha256 (base32 - "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz")))) - (build-system gnu-build-system) + "1gdcvqz88qkp402zra9csc6391f2xki1270x683n6ixakl3gf8w4")))) + (build-system meson-build-system) (inputs `(("openssl" ,openssl) ("cyrus-sasl" ,cyrus-sasl) 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)