From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id YJysJCc8s2VrBgEAqHPOHw:P1 (envelope-from ) for ; Fri, 26 Jan 2024 05:59:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id YJysJCc8s2VrBgEAqHPOHw (envelope-from ) for ; Fri, 26 Jan 2024 05:59:19 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=l+NaVYuR; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1706245159; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=CrCa+pUyxVIzyy2QH13yBVLWs8kvMPW7sP61XuyZ6V0=; b=o9Pkkb3xD/JH0M/wW+lwajb4nDR8rIINgiaxHGMlX6hUwMzeK+YjqifkCamJa8HKqbYUNP EsAdcXx0N2l6KVPSCHr66a37KQabIytEiGGfl6agMNvMdLgUw4tt8efvGItcuZo1u8E+9s dN9aIJYL6PF1hRgtyOfpQL/CY7ctRlWrtKLNAZGqriOfXHyyS/Ioz/Awf2xUfYtl/pISzg o/dlogikFtw42/0T1Q9h3zBCjalyC6CHYfIEpDKAAavOj92ygYnlD2zCIfzqVEtpl7Vd8/ 0xKlZlCRwnKiTlbXoLdDIB66amJO/lPQMRedRLFInFw8XxZh0AgtIZ4Eeg/PnQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=l+NaVYuR; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1706245159; a=rsa-sha256; cv=none; b=MMUNV3y1gb/HBNkyQucCgWqqv80u23aq5h8S6r6y72cp9pw45yIOrCNzJ6U4p2ooaCa7te CsfenQPdms4RvqU0a8sj0LH7xCj7p9E8zVG1vlRGHKPf8BkMNrDHt+fQTDtEQJx8/hy+NP ef2+sAbLHh9FmSc5BUjevvK4baxbLBxNUx0+TFVqMxspMIRKThfuwnrP7ttbwFuKn5PoeX 2iQdxTuIamB8DQzbEfIYaEcHforLhqkA5JeeHnf0jIKX4LZ7s75k4gjDxsphKt0kYdpfRd TvXAFOx+r9qgLEY66aMJ+vt34TV4sBkUx5O0RfccWmUuvPred/xCgULfC3p1fw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4AC39701E1 for ; Fri, 26 Jan 2024 05:59:19 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rTEIs-000579-5w; Thu, 25 Jan 2024 23:58:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rTEIq-00056Z-RV for guix-patches@gnu.org; Thu, 25 Jan 2024 23:58:56 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rTEIq-0007mf-9A for guix-patches@gnu.org; Thu, 25 Jan 2024 23:58:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rTEIw-0000Qz-C2; Thu, 25 Jan 2024 23:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68728] [PATCH 1/2] gnu: virt-manager: Update package style. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Fri, 26 Jan 2024 04:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68728 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68728@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 68728-submit@debbugs.gnu.org id=B68728.17062451351644 (code B ref 68728); Fri, 26 Jan 2024 04:59:02 +0000 Received: (at 68728) by debbugs.gnu.org; 26 Jan 2024 04:58:55 +0000 Received: from localhost ([127.0.0.1]:49874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTEIo-0000QM-Lf for submit@debbugs.gnu.org; Thu, 25 Jan 2024 23:58:55 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:34536) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rTEIl-0000QB-J8 for 68728@debbugs.gnu.org; Thu, 25 Jan 2024 23:58:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1706245087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CrCa+pUyxVIzyy2QH13yBVLWs8kvMPW7sP61XuyZ6V0=; b=l+NaVYuRMuhYvYFipM8yHsu+4aBH5ImhiiTTaTOjM2LfF92/nlAW+QlYN+daDMSZ9Ascjn +QCQ1P5/HJjSO7cJ5+r2TDWBMww7GXRlB9NK4xTU9Wx9klX4/88PaQBzeDrlJUd07X4tKe AwLSeMblMtgeR+WLCxCQpTP4NEqtZfeUxvxKQRMT3RIUvjABFpdxyj3ReB2N+EGShe9x/z 264PvHwjg/R2fB1P5Ay78itT5w+3TLVhUcr5wn0HE3TwLnj/uulOoKKTITdoeUYbU5+h+b ZvuyGsRDOxwU5WLufWNVs8/zUWWYygsFvTIA3Z2sFQ3BhN2JrV8Nq+ZAlCrYQw== Date: Fri, 26 Jan 2024 12:58:19 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches From: Hilton Chain via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.16 X-Migadu-Queue-Id: 4AC39701E1 X-Spam-Score: -5.16 X-Migadu-Scanner: mx11.migadu.com X-TUID: +ObFCq5mP6jt * gnu/packages/virtualization.scm (virt-manager)[arguments]: Remove trailing #t. Use gexps. [inputs]: Sort alphabetically. [native-inputs]: Remove labels. Change-Id: I6efe95061ff13feb01c45809004884ab0a563d0c --- gnu/packages/virtualization.scm | 153 ++++++++++++++++---------------- 1 file changed, 75 insertions(+), 78 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 35bac9a5ac..1c971471c7 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1623,98 +1623,95 @@ (define-public virt-manager "18lhlnd3gmyzhbnjc16gdyzhjcd33prlxnca4xlidiidngbq21lm")))) (build-system python-build-system) (arguments - `(#:use-setuptools? #f ; uses custom distutils 'install' command - #:tests? #f ; TODO The tests currently fail - ; RuntimeError: Loop condition wasn't - ; met - #:imported-modules ((guix build glib-or-gtk-build-system) - ,@%python-build-system-modules) - #:modules ((ice-9 match) - (srfi srfi-26) - (guix build python-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) - (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-setup - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "virtinst/buildconfig.py" - (("/usr") (assoc-ref outputs "out"))) - #t)) - (add-after 'unpack 'fix-default-uri - (lambda* (#:key inputs #:allow-other-keys) - ;; Xen is not available for now - so only patch qemu. - (substitute* "virtManager/createconn.py" - (("/usr(/bin/qemu-system-[a-zA-Z0-9_-]+)" _ suffix) - (search-input-file inputs suffix))) - #t)) - (add-before 'wrap 'wrap-with-GI_TYPELIB_PATH - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((bin (string-append (assoc-ref outputs "out") "/bin")) - (bin-files (find-files bin ".*")) - (paths (map (match-lambda - ((output . directory) - (let* ((girepodir (string-append - directory - "/lib/girepository-1.0"))) - (if (file-exists? girepodir) - girepodir #f)))) - inputs))) - (for-each (lambda (file) - (format #t "wrapping ~a\n" file) - (wrap-program file - `("GI_TYPELIB_PATH" ":" prefix - ,(filter identity paths)))) - bin-files)) - #t)) - (replace 'check - (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")) - #t)) - (add-after 'install 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) - (add-after 'wrap 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (list #:use-setuptools? #f ; uses custom distutils 'install' command + #:tests? #f ; TODO: The tests currently fail + ; RuntimeError: Loop condition wasn't met + #:imported-modules + `((guix build glib-or-gtk-build-system) + ,@%python-build-system-modules) + #:modules + '((ice-9 match) + (srfi srfi-26) + (guix build python-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-setup + (lambda _ + (substitute* "virtinst/buildconfig.py" + (("/usr") #$output)))) + (add-after 'unpack 'fix-default-uri + (lambda* (#:key inputs #:allow-other-keys) + ;; Xen is not available for now - so only patch qemu. + (substitute* "virtManager/createconn.py" + (("/usr(/bin/qemu-system-[a-zA-Z0-9_-]+)" _ suffix) + (search-input-file inputs suffix))))) + (add-before 'wrap 'wrap-with-GI_TYPELIB_PATH + (lambda* (#:key inputs #:allow-other-keys) + (let* ((bin (string-append #$output "/bin")) + (bin-files (find-files bin ".*")) + (paths (map (match-lambda + ((output . directory) + (let* ((girepodir (string-append + directory + "/lib/girepository-1.0"))) + (if (file-exists? girepodir) + girepodir #f)))) + inputs))) + (for-each (lambda (file) + (format #t "wrapping ~a\n" file) + (wrap-program file + `("GI_TYPELIB_PATH" ":" prefix + ,(filter identity paths)))) + bin-files)))) + (replace 'check + (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")))) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'wrap 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (inputs (list dconf gtk+ gtk-vnc gtksourceview-4 + libosinfo libvirt libvirt-glib - libosinfo - vte python-libvirt - python-requests + python-libxml2 python-pycairo python-pygobject - python-libxml2 - spice-gtk)) + python-requests + spice-gtk + vte)) ;; virt-manager searches for qemu-img or kvm-img in the PATH. (propagated-inputs (list qemu)) (native-inputs - `(("glib" ,glib "bin") ; glib-compile-schemas - ("gobject-introspection" ,gobject-introspection) - ("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) - ;; ("at-spi2-core" ,at-spi2-core) - ;; ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - )) + (list `(,glib "bin") ; glib-compile-schemas + gobject-introspection + `(,gtk+ "bin") ; gtk-update-icon-cache + intltool + perl ; pod2man + python-docutils ; rst2man + ;; The following are required for running the tests + ;; at-spi2-core + ;; dbus + ;; gsettings-desktop-schemas + ;; python-dogtail + ;; python-pytest + ;; xorg-server-for-tests ; xvfb + )) (home-page "https://virt-manager.org/") (synopsis "Manage virtual machines") (description -- 2.41.0