From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 13:04:16 2024 Received: (at submit) by debbugs.gnu.org; 19 Feb 2024 18:04:16 +0000 Received: from localhost ([127.0.0.1]:43352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc7zz-0005MH-Q0 for submit@debbugs.gnu.org; Mon, 19 Feb 2024 13:04:16 -0500 Received: from lists.gnu.org ([209.51.188.17]:52108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc7zw-0005M6-5s for submit@debbugs.gnu.org; Mon, 19 Feb 2024 13:04:15 -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 1rc7za-0006Ad-KC for guix-patches@gnu.org; Mon, 19 Feb 2024 13:03:50 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rc7zY-00024W-KW for guix-patches@gnu.org; Mon, 19 Feb 2024 13:03:50 -0500 Received: by mail.gandi.net (Postfix) with ESMTPSA id 0BF92E0003; Mon, 19 Feb 2024 18:03:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1708365824; 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; bh=HM6iLN3cJJro/gEOJJT4KDYC27ZiDtrvA8EAzeTix8w=; b=CgunJdsxQNCrvEtyDUvv8NOdpbXgAPTOfSpfSC32oqxb7N05o7E1/zNkXG497Bzi+VE5Sb AqsBE8kv88jvPdCzaZaZJBTfW/caaC+Za0sJ1xBcN/wUMZJi9TR22joYMAliQvEoouoZ94 QojLMug+KxTozOTCOnjE3ZH4LpKNWBTHXfWD/rZgU2PLxQy2thkzG5UDjvjJu0vjSKRGCV kOg2PQQvzVvAzSg0gv6AwgNQwixgCAU1HRbke8bKEYsO2bN3PEf2nDqnYp3TeTAECoBXO9 mddu7uk8VnmzER2zFXPVz7VaK7l3AFRVpWnc3VqXk2+tPH2vU6qJB5usheK/Ow== From: Juliana Sims To: guix-patches@gnu.org Subject: [PATCH 0/2] Update nicotine+ to 3.3.0. Date: Mon, 19 Feb 2024 13:02:55 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-GND-Sasl: juli@incana.org Received-SPF: pass client-ip=217.70.183.196; envelope-from=juli@incana.org; helo=relay4-d.mail.gandi.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -3.4 (---) X-Debbugs-Envelope-To: submit Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.4 (----) Hello, This patch series starts with a simple version bump of nicotine+, followed by a patch to port it to g-expressions. Thanks, Juli Juliana Sims (2): gnu: nicotine+: Update to 3.3.0. gnu: nicotine+: Use g-expressions. gnu/packages/nicotine.scm | 83 +++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 38 deletions(-) base-commit: 7d6550eec7fe98517a2096d55760a4d5be3ad8ef -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 13:06:44 2024 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 To: 69277@debbugs.gnu.org Subject: [PATCH 1/2] gnu: nicotine+: Update to 3.3.0. 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 Content-Transfer-Encoding: 8bit X-GND-Sasl: juli@incana.org X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: 69277 Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.6 (---) * 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) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 13:06:48 2024 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 To: 69277@debbugs.gnu.org Subject: [PATCH 2/2] gnu: nicotine+: Use g-expressions. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-GND-Sasl: juli@incana.org X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: 69277 Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.6 (---) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 13:23:44 2024 Received: (at 69277) by debbugs.gnu.org; 19 Feb 2024 18:23:44 +0000 Received: from localhost ([127.0.0.1]:43375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc8Ip-0005rM-TO for submit@debbugs.gnu.org; Mon, 19 Feb 2024 13:23:44 -0500 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:56137) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rc8Il-0005r5-IE for 69277@debbugs.gnu.org; Mon, 19 Feb 2024 13:23:42 -0500 Received: by mail.gandi.net (Postfix) with ESMTPSA id 544FE40007; Mon, 19 Feb 2024 18:23:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=incana.org; s=gm1; t=1708366991; 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; bh=kIBb9iWnyoikiXi5Q8+qYtEQq7AMvUOdr3girxa2/OA=; b=BPYMgwWSPFwUTsTQkjm7/n8Ik1/qpjaBkDWaeDZyomR6rCRfDYWnBLfilRvZSPUcsDjymI QvNPHjnXrfz26+Z4u80n0PM9inwqa9qFp2RhcIue/nZ8C10OyFahG5qaNgpiQetF7CKvxc uUj4Wqhtt6n0kPglHm+P1/hiqyQkDiSCK6q7ghAxy0MYvdBgBmf+c0yuybCGkdjLhVoICT IJ84iMWct+HxaklBLEqrZbixo4Kg6y8+KORixwY//addDpTsaVgeXRDrHb8m2t+6otI1M8 0UBcvis2/EWu82T6DEOoNGYxWHxyBheEjiPvPLzO5X/EsVbhXbOYuep3rX1ntA== From: Juliana Sims To: 69277@debbugs.gnu.org Subject: [PATCH v2 1/2] gnu: nicotine+: Update to 3.3.0. Date: Mon, 19 Feb 2024 13:21:40 -0500 Message-ID: <2abfd2daf4291e16ef019c0a2d727bee9b9b28a2.1708366901.git.juli@incana.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-GND-Sasl: juli@incana.org X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: 69277 Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.6 (---) Hello, I forgot to use gtk4 as the latest release of nicotine+ supports it. This patch series is identical to the previous one except that it uses gtk instead of gtk+. Thanks, Juli * gnu/packages/nicotine.scm (nicotine+): Update to 3.3.0. --- gnu/packages/nicotine.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/nicotine.scm b/gnu/packages/nicotine.scm index 08232c2756..909adfd3d0 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) @@ -72,7 +72,7 @@ (define-public nicotine+ (when tests? (invoke "xvfb-run" "python" "-m" "unittest"))))))) (inputs - (list bash-minimal gspell gtk+ python-pygobject libappindicator python-pytaglib)) + (list bash-minimal gspell gtk python-pygobject libappindicator python-pytaglib)) (native-inputs (list gettext-minimal xvfb-run)) (home-page "https://nicotine-plus.org/") base-commit: 7d6550eec7fe98517a2096d55760a4d5be3ad8ef -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 19 13:23:48 2024 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 To: 69277@debbugs.gnu.org Subject: [PATCH v2 2/2] gnu: nicotine+: Use g-expressions. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-GND-Sasl: juli@incana.org X-Spam-Score: -2.6 (--) X-Debbugs-Envelope-To: 69277 Cc: Juliana Sims X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.6 (---) * 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 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Nov 03 18:43:07 2024 Received: (at 69277-done) by debbugs.gnu.org; 3 Nov 2024 23:43:07 +0000 Received: from localhost ([127.0.0.1]:35723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t7kFO-0001zw-Tb for submit@debbugs.gnu.org; Sun, 03 Nov 2024 18:43:07 -0500 Received: from mail-wm1-f45.google.com ([209.85.128.45]:43209) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t7kFN-0001zq-7A for 69277-done@debbugs.gnu.org; Sun, 03 Nov 2024 18:43:05 -0500 Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4314c452180so27219505e9.0 for <69277-done@debbugs.gnu.org>; Sun, 03 Nov 2024 15:43:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730677324; x=1731282124; darn=debbugs.gnu.org; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=b1cwft9jZqK1NZRPq5JcHH50kzQ6AVV7s2PAN4vU/AA=; b=dIj8oeN6MoYIE3PDG1WjI30PX/XvZtw0OoXUE2PG99YuPCC0rRI1KqeP7Drj2DcalO npnbQE3lsWayB+AKrKhJixD+75xkv4RzW/YEAx1W/9Mne3GQxZtRBnAbBrXv3NlEk/y4 2DH2g6DBio77sDiGFIkWpcuadPDOIzCEMK5IeP6VUP+M5TiLOnoMch/bO4m6l3GGL3wx BI0NF+40HhfdNOHCyW1XNqu5FFZl+7AdDWLMZdAwK/A+RnTTlHS1aXfzq0KztPrViNlP q8a2cRagScS1rPUIr8945ie2vwWSw/N7SJaKvToxBbGk2xK9RJOmN1BWx+g5N5JXfu50 uRKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730677324; x=1731282124; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=b1cwft9jZqK1NZRPq5JcHH50kzQ6AVV7s2PAN4vU/AA=; b=q394Nye4m6SjuudLVoI3EXxKcZx1f0Smgb+lRNDa7jPSlL22EDxYUaVWPYbXGswFRt xCqfKf/vLVNsQFtrwVZR8Ngj1F/ZhApflvlAj0tjoYyH/3hbiLMEwdU4yuGcNOYbRJnx 9XoQgxeLLEWprWekNKY+AfaRuEbcsx7oAgCUbXYAqmHj+SipI/MuCTL0svvRVKmiB10Y Kb22fbTuuvFhiArHFcxuOg5EdeWhzb8wZ/9/xb8uo/KzFVlSOQDdTvyBQwzkd6+ZE0/t 88U7zHC2QqTLYD+TyaSKS4O5ZXMWILgrPKDKSyEkj2gqvYZuUhh9+Nu1b1H6YAqvQqgP CQ9Q== X-Gm-Message-State: AOJu0YyLLnaGLVroVzLIl3CPW3EmT5Ks+i2ejEgEfHulzn5s+z1W9Hgi z+PfmWZzy3sPFiXC6H+RzZbh56FwJB/0b3RHhUg087DwgraYn3E+tvRgiu+p X-Google-Smtp-Source: AGHT+IGJXB79pGA0yWeuHl7LFb+AoZnymb1rikymI/YS55v85LX8As0qJiiRrLEF3gsvLA1p9AQK2g== X-Received: by 2002:a05:600c:1c26:b0:42c:b603:422 with SMTP id 5b1f17b1804b1-4327daa3649mr100640605e9.8.1730677324431; Sun, 03 Nov 2024 15:42:04 -0800 (PST) Received: from guxtil (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4327d5ab297sm136249595e9.8.2024.11.03.15.42.03 for <69277-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Nov 2024 15:42:03 -0800 (PST) From: Sharlatan Hellseher To: 69277-done@debbugs.gnu.org Subject: [PATCH 0/2] Update nicotine+ to 3.3.0. Date: Sun, 03 Nov 2024 23:42:03 +0000 Message-ID: <87h68nubp0.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 69277-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Hi, Pushed as 51387c0f42..23961986cf to master. -- Thanks, Oleg --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmcoCksACgkQdtcnv/Ys 0rUrURAAsaz1Z0B4n9W6nBd3EppC+rIWiIywQ0GweZ6pEFVJYPJLyuB+3I3UvqLE suIVrP0Gbsl99oRTDhIR9mUmGudEoyvXvK35fQG12LbnXR+Lw8Y8joU7jVuZv9VK PgN7e+4SwstYyG8J70u0Vyp2mW8N1RCxqPXhmgZs26DHZiWj2xMmjum2jBPgFEWu eAjZdLEWpUh86KFrjxIW4i3zijL1SojW6wmBSFvpbRwgScVwZI2CPY1oLvoFATaq pzaf+n9RqPZ3ng8OsCuawQXZLd+R8jzUP4/159p/TKG4nZjC5wVNvE3UK/Kv3v2r kTXSc2kudXJNKWM8CvjCZxMde1mHjrlbUploLhVVBO06WwzKRcP1VnqeOs9/sOoG zC9kaZAGeTJqxSyDfW6/q51NSUf361w6ex4EoZ2EXUBZ/TFghZvfZwSB1oLR4W32 42JWcsrN/Q48KKR+FgdzXmRzA2FPnbXy+znBgBdZ02SdEKjU+xPot+Rnq4H2IKnq RFUnS4yAaNWNj7pdkARg0W9QJQe07o7hA1/Jh5VA7lGcjK05Y8pB4ey8Lt3jejsJ QrgJUaBqfHjptebgeVmRXRW4j5zRlRoTzARy2kSKOsK2DlmmeGbgpkl6dW1HvzGe Hx32ykGwC4Jttt+ZRLKr00per0gPM20w5S3RFqa6YaNZuJEz6P8= =SsCu -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Nov 04 08:08:56 2024 Received: (at 69277-submitter) by debbugs.gnu.org; 4 Nov 2024 13:08:56 +0000 Received: from localhost ([127.0.0.1]:39771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t7wpD-0002AY-OI for submit@debbugs.gnu.org; Mon, 04 Nov 2024 08:08:55 -0500 Received: from mailtransmit04.runbox.com ([185.226.149.37]:35150) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t7wp8-0002AF-Hg; Mon, 04 Nov 2024 08:08:52 -0500 Received: from mailtransmit03.runbox ([10.9.9.163] helo=aibo.runbox.com) by mailtransmit04.runbox.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1t7wmx-0096QV-2O; Mon, 04 Nov 2024 14:06:35 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=futurile.net; s=selector1; h=Content-Type:MIME-Version:Message-ID:Subject: Cc:To:From:Date; bh=tgUaTKhG4i7gdet5/mvvZih9QYu7IHS4H5MmCaEH/8I=; b=47/4EyYUv 3opbXR2ANIKPNTYO8Vo5sw/8K4lkYHkNWpbOywsiCsStHLwyt6Q9JUgjJG5IPMBkHMlyoC+wvKEvP eN9V3T2kfEMaPWGdI3EQEaxKcdHj6DmBWX6caJ1gJUBZg7o00XUBIzV3MzA+0QaSNLN40To1jJJd+ uC5/Jj5j/fgnTN6v89Vmdgn+od4PvdEk7o0fgbdpRz5KTWfmG8YMDvBYvK4tD+LsqrzcTPP1G/rux mz0rMz+qhKIo3cLpicwP4gUqDTaa1YmFwn2mWkveV3gXXjmxIqgaygev9LuwLZp5mSXTwyf+8V0ck PihRgTKWasnNjn5avxdUv6uIQ==; Received: from [10.9.9.73] (helo=submission02.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1t7wmw-000515-Ni; Mon, 04 Nov 2024 14:06:34 +0100 Received: by submission02.runbox with esmtpsa [Authenticated ID (641962)] (TLS1.2:ECDHE_SECP256R1__RSA_SHA256__AES_256_GCM:256) (Exim 4.93) id 1t7wmk-006avg-V1; Mon, 04 Nov 2024 14:06:23 +0100 Date: Mon, 4 Nov 2024 13:06:22 +0000 From: Steve George To: control@debbugs.gnu.org Subject: closing 69277 Message-ID: <1730725317-941-bts-steve@futurile.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: devscripts bts/2.22.1ubuntu1 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 69277-submitter Cc: 69277-submitter@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) close 69277 # Hi - thanks for your patch it's in the archive in: # 24fc92e049d803664a2a41a68cad83404d1de6da thanks From unknown Tue Jun 17 22:11:54 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 03 Dec 2024 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator