From patchwork Mon Feb 19 18:21:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 23833 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 055A727BBE2; Mon, 19 Feb 2024 18:24:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CB7EB27BBE9 for ; Mon, 19 Feb 2024 18:23:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rc8Ir-0006BH-IZ; Mon, 19 Feb 2024 13:23:45 -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 1rc8In-0006AW-MK for guix-patches@gnu.org; Mon, 19 Feb 2024 13:23:41 -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 1rc8In-0006Bp-Da for guix-patches@gnu.org; Mon, 19 Feb 2024 13:23:41 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rc8J8-0005sJ-F3 for guix-patches@gnu.org; Mon, 19 Feb 2024 13:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69277] [PATCH v2 2/2] gnu: nicotine+: Use g-expressions. Resent-From: Juliana Sims Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Feb 2024 18:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69277 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69277@debbugs.gnu.org Cc: Juliana Sims Received: via spool by 69277-submit@debbugs.gnu.org id=B69277.170836702822556 (code B ref 69277); Mon, 19 Feb 2024 18:24:02 +0000 Received: (at 69277) by debbugs.gnu.org; 19 Feb 2024 18:23:48 +0000 Received: from localhost ([127.0.0.1]:43378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc8It-0005rd-B1 for submit@debbugs.gnu.org; Mon, 19 Feb 2024 13:23:47 -0500 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:53013) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc8Iq-0005rC-U6 for 69277@debbugs.gnu.org; Mon, 19 Feb 2024 13:23:46 -0500 Received: by mail.gandi.net (Postfix) with ESMTPSA id 4AEA540002; Mon, 19 Feb 2024 18:23:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1708366998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VCLU+hyL9Ae3OybDzjLPeoZUwM8RK01KEV6xca72VTo=; b=Mvvj9wLwVx7iRwFnzmEfXzZWgaQVKUy+ot9q6B+gPFVPaNmibduVS11TyBSgCxzu4h3Icb lOhyWXkm5rihdEqXXiPjptBXHSX6iSnj+kW5H+VbkF10pmGOm4M1sjOuZjSOBhzvVDAVUE +7dt7kQybgHgQ1G/mGPgHZiLxL3Jr30MihSLbVuBxphzV83XfVomDMj/JR9HsInsPE7gUN DikhSkHqMuZchqoPbwruEfWI5y2OhR6SXcRXV64HBor7gLzVFCqXWoRk70Dga3va16IgZk UqzuUMIE51fWFScq7yKf0A1yTcHDWG/uetniT+uzyQ04WiESmzf7rZ27dl3h/w== From: Juliana Sims Date: Mon, 19 Feb 2024 13:21:41 -0500 Message-ID: <45639fd3485db932d0976c82f57bda93a135a0f8.1708366901.git.juli@incana.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <2abfd2daf4291e16ef019c0a2d727bee9b9b28a2.1708366901.git.juli@incana.org> References: <2abfd2daf4291e16ef019c0a2d727bee9b9b28a2.1708366901.git.juli@incana.org> MIME-Version: 1.0 X-GND-Sasl: juli@incana.org 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/nicotine.scm (nicotine+): Use g-expressions, lint, style. Change-Id: If51864440781825dddc7745a88c6efec02ed8e30 --- gnu/packages/nicotine.scm | 81 +++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 37 deletions(-) diff --git a/gnu/packages/nicotine.scm b/gnu/packages/nicotine.scm index 909adfd3d0..6b08f2a66d 100644 --- a/gnu/packages/nicotine.scm +++ b/gnu/packages/nicotine.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2022 Fatima Toothpaste +;;; Copyright © 2024 Juliana Sims ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,6 +21,7 @@ (define-module (gnu packages nicotine) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system python) #:use-module (gnu packages bash) @@ -35,46 +37,51 @@ (define-public nicotine+ (package (name "nicotine+") (version "3.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Nicotine-Plus/nicotine-plus") - (commit version))) - (file-name (git-file-name name version)) - (sha256 (base32 "1qzc8k2pkw4sgb4p1qrd9d71j8m5v834v0df5qvdfwgnmsn4dnzj")) - (modules '((guix build utils))) - ;; Remove test that relies on network access. - (snippet '(delete-file-recursively "pynicotine/tests/unit/test_version.py")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Nicotine-Plus/nicotine-plus") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qzc8k2pkw4sgb4p1qrd9d71j8m5v834v0df5qvdfwgnmsn4dnzj")) + (modules '((guix build utils))) + ;; Remove test that relies on network access. + (snippet '(delete-file-recursively + "pynicotine/tests/unit/test_version.py")))) (build-system python-build-system) (arguments - `(#:imported-modules ((guix build glib-or-gtk-build-system) + (list + #:imported-modules `((guix build glib-or-gtk-build-system) ,@%python-build-system-modules) - #:modules - ((guix build utils) - (guix build python-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)) - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((prog (string-append - (assoc-ref outputs "out") - "/bin/nicotine")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - (wrap-program prog - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))) - (add-after 'wrap-program 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)) - (add-after 'glib-or-gtk-wrap 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "xvfb-run" "python" "-m" "unittest"))))))) - (inputs - (list bash-minimal gspell gtk python-pygobject libappindicator python-pytaglib)) - (native-inputs - (list gettext-minimal xvfb-run)) + #:modules `((guix build utils) + (guix build python-build-system) + ((guix build glib-or-gtk-build-system) + #:prefix glib-or-gtk:)) + #:phases #~(modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda _ + (wrap-program (string-append #$output "/bin/nicotine") + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH")))))) + (add-after 'wrap-program 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases + 'glib-or-gtk-wrap)) + (add-after 'glib-or-gtk-wrap 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases + 'glib-or-gtk-compile-schemas)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "xvfb-run" "python" "-m" "unittest"))))))) + (inputs (list bash-minimal + gspell + gtk + python-pygobject + libappindicator + python-pytaglib)) + (native-inputs (list gettext-minimal xvfb-run)) (home-page "https://nicotine-plus.org/") (synopsis "Graphical client for Soulseek") (description