From patchwork Mon Feb 19 18:05:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 60787 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 C0B3227BBEA; Mon, 19 Feb 2024 18:07:06 +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=ham 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 51DAD27BBE2 for ; Mon, 19 Feb 2024 18:07:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rc82N-00079t-8C; Mon, 19 Feb 2024 13:06:43 -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 1rc82L-00079W-1P for guix-patches@gnu.org; Mon, 19 Feb 2024 13:06: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 1rc82K-0002cU-P2 for guix-patches@gnu.org; Mon, 19 Feb 2024 13:06:40 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rc82f-0005Qp-QW for guix-patches@gnu.org; Mon, 19 Feb 2024 13:07:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69277] [PATCH 1/2] gnu: nicotine+: Update to 3.3.0. Resent-From: Juliana Sims Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Feb 2024 18:07:01 +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.170836600420842 (code B ref 69277); Mon, 19 Feb 2024 18:07:01 +0000 Received: (at 69277) by debbugs.gnu.org; 19 Feb 2024 18:06:44 +0000 Received: from localhost ([127.0.0.1]:43357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc82O-0005Q6-9d for submit@debbugs.gnu.org; Mon, 19 Feb 2024 13:06:44 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:57601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc82L-0005Pq-A7 for 69277@debbugs.gnu.org; Mon, 19 Feb 2024 13:06:42 -0500 Received: by mail.gandi.net (Postfix) with ESMTPSA id 0DB9E60007; Mon, 19 Feb 2024 18:05:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1708365953; 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=N5z3RSVclFYP92BfDbhqx3Aonp4nzpY8HnwyRCyN7tU=; b=guITEeX6ygANBGW7wKpvzFSst/5wbercb11AWeWSH9jPyTHUNDVppFYYWQiCHOT3T0jNLW IFSf2BFTy/+t2+UYPQfCvWu+PSu/u3s1Xnjm4LAJPhVIQwUCu/lSrRORaDzYENoIr5EaZ9 44RWeg4QUjgOcdRmodh/DxPXeMewQUsFbP4F5xZgrGhJoaZG8RQ0ooyDSd1wK/92iq+C+p pJEtEESDNbBlA65dMbdDcAwAGU7O/USw2uFzZe7k+8DfmmnKMiM7q/l/sM6drWUCpx9Y+f EZ0nt9B1dTSgDVaM3x/I735n8S64+VzXDYUYH0G5JStdaZb8kBu/hQPg3mM8Fw== From: Juliana Sims Date: Mon, 19 Feb 2024 13:05:28 -0500 Message-ID: <3b26bf335c62fbbde02e885721743c8be304bb45.1708364747.git.juli@incana.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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+): Update to 3.3.0. Change-Id: I793131250f33af003b6adc72bdf03b0759e23d8e --- gnu/packages/nicotine.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/nicotine.scm b/gnu/packages/nicotine.scm index 08232c2756..3c8a384659 100644 --- a/gnu/packages/nicotine.scm +++ b/gnu/packages/nicotine.scm @@ -34,17 +34,17 @@ (define-module (gnu packages nicotine) (define-public nicotine+ (package (name "nicotine+") - (version "3.2.1") + (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 "1x08z5lvkdl62dkc11vrsackgzsh1vr9vp3vgsgfzjyrvlsybmfw")) + (sha256 (base32 "1qzc8k2pkw4sgb4p1qrd9d71j8m5v834v0df5qvdfwgnmsn4dnzj")) (modules '((guix build utils))) ;; Remove test that relies on network access. - (snippet '(delete-file-recursively "test/integration")))) + (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) From patchwork Mon Feb 19 18:05:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Juliana Sims X-Patchwork-Id: 60786 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 E597C27BBE9; Mon, 19 Feb 2024 18:06:59 +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 6A5BB27BBE2 for ; Mon, 19 Feb 2024 18:06:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rc82P-0007AG-V8; Mon, 19 Feb 2024 13:06: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 1rc82L-00079e-Az for guix-patches@gnu.org; Mon, 19 Feb 2024 13:06: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 1rc82L-0002cZ-2s for guix-patches@gnu.org; Mon, 19 Feb 2024 13:06:41 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rc82g-0005Qw-95 for guix-patches@gnu.org; Mon, 19 Feb 2024 13:07:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69277] [PATCH 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:07: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.170836600820860 (code B ref 69277); Mon, 19 Feb 2024 18:07:02 +0000 Received: (at 69277) by debbugs.gnu.org; 19 Feb 2024 18:06:48 +0000 Received: from localhost ([127.0.0.1]:43360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc82R-0005QN-N8 for submit@debbugs.gnu.org; Mon, 19 Feb 2024 13:06:48 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:44965) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc82P-0005Pv-6g for 69277@debbugs.gnu.org; Mon, 19 Feb 2024 13:06:46 -0500 Received: by mail.gandi.net (Postfix) with ESMTPSA id D748860006; Mon, 19 Feb 2024 18:05:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1708365958; 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=wNtgecizjGejNaJjh1u0mZcWSpBrfMQhrXuqbAu5NzE=; b=YzFY/AJ5WAeW2bljjn0KnG72ilhOlFvGTHcAp+UEFEdg/o8W1aFDlQRDnXAYgdViZjsmuB TJdM6oAVClzxR2g+RdGklPuAWJoeLg2p4YIVC1r6q27apxzPDWDu8/DOwdLe7JAoHCNmM4 uSIV5HPxt7I6BXPOK+CYc2jMygPQMBSy7MibWoy0GeDbipxKjXk4DvCDZVWdgNz+8vth/4 4qUtLS+P7YNIG21c4X8+gyTjErvtfIFGYJo4lriSGowpeoxbk1oeH3A8kJUbR7hVOcpjmS m/8EnMw4yDwRLoX//SLPuNAVZveE2iymLckv21Th6vmtSR0KXvY3uuMLDjvRZQ== From: Juliana Sims Date: Mon, 19 Feb 2024 13:05:29 -0500 Message-ID: <8efebe7659bf32271d048d4481b50423450516b2.1708364748.git.juli@incana.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 3c8a384659..5a96a76e47 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