From patchwork Sun Mar 13 15:41:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fatima Toothpaste X-Patchwork-Id: 37777 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 04F2B27BBE9; Sun, 13 Mar 2022 15:46:49 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 7401127BBEA for ; Sun, 13 Mar 2022 15:46:48 +0000 (GMT) Received: from localhost ([::1]:47438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nTQQh-0007dy-Kh for patchwork@mira.cbaines.net; Sun, 13 Mar 2022 11:46:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nTQPy-0007da-T4 for guix-patches@gnu.org; Sun, 13 Mar 2022 11:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49253) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nTQPy-0006bJ-LP for guix-patches@gnu.org; Sun, 13 Mar 2022 11:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nTQPy-0001sa-Cp for guix-patches@gnu.org; Sun, 13 Mar 2022 11:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54273] [PATCH V3] gnu : nicotine+: Update to 3.2.1. References: <20220306054551.19383-1-fatimatoothpaste@disroot.org> In-Reply-To: <20220306054551.19383-1-fatimatoothpaste@disroot.org> Resent-From: Fatima Toothpaste Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Mar 2022 15:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54273 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: maximedevos@telenet.be, ludo@gnu.org Cc: 54273@debbugs.gnu.org, Fatima Toothpaste Received: via spool by 54273-submit@debbugs.gnu.org id=B54273.16471863197141 (code B ref 54273); Sun, 13 Mar 2022 15:46:02 +0000 Received: (at 54273) by debbugs.gnu.org; 13 Mar 2022 15:45:19 +0000 Received: from localhost ([127.0.0.1]:43149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTQPH-0001r6-00 for submit@debbugs.gnu.org; Sun, 13 Mar 2022 11:45:19 -0400 Received: from knopi.disroot.org ([178.21.23.139]:58682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nTQPF-0001qz-6i for 54273@debbugs.gnu.org; Sun, 13 Mar 2022 11:45:17 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7C564400BE; Sun, 13 Mar 2022 16:45:16 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y8kEAZ3K8GP8; Sun, 13 Mar 2022 16:45:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1647186315; bh=uJlJKm63DwaHDRyfc5OY9Wfgaq6+Sqlatftqm/7PB74=; h=From:To:Cc:Subject:Date; b=F2n7PwYtm06sR9rjbLq9On4JzAzv6FB+aGoDLvFKeUEZEfWk11MubY062CJydVxwR 08ykMR2+KM2gSodPAkRrRl1HWFd2zU/556UigApAUDInntxbG2dvqJtUQUXXQcXWG/ kyVJRDC7dQ/o8Y3NalY76QQYISYF4hoWF3MdG2m3rGWSOiqsVLMX0UhHCv1e5hOT8i b8e9MHRHMOZvrAvxJWN1c//ITSpKtNeb6aPIjpV9TuYKGGOj0hk2xgITBPzLZajai+ cXzpBNJxLiGA0HZmD1R4dp9kPjxikCF3NApqZufNziyciEnU+c2vl+BA4blJGlxHdl yssYuxVpbQowQ== Date: Mon, 14 Mar 2022 00:41:24 +0900 Message-Id: <20220313154124.18317-1-fatimatoothpaste@disroot.org> Mime-Version: 1.0 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" Reply-to: Fatima Toothpaste X-ACL-Warn: , Fatima Toothpaste via Guix-patches X-Patchwork-Original-From: Fatima Toothpaste via Guix-patches via From: Fatima Toothpaste X-getmail-retrieved-from-mailbox: Patches * gnu/packages/nicotine.scm (nicotine+): Update to 3.2.1. [source]: Delete network requried tests in snippet. [arguments]: Remove trailing #t. Replae 'check phase to run proper test. [inputs]: Add bash-minimal, gspell, libappindicator. [native-inputs]: Remove python-pytest. Add xvfb-run. [home-page]: Update URL. --- gnu/packages/nicotine.scm | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/gnu/packages/nicotine.scm b/gnu/packages/nicotine.scm index 8e194697de..d46c5603f3 100644 --- a/gnu/packages/nicotine.scm +++ b/gnu/packages/nicotine.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2022 Fatima Toothpaste ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,23 +22,29 @@ (define-module (gnu packages nicotine) #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system python) + #:use-module (gnu packages bash) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages gettext) #:use-module (gnu packages gtk) - #:use-module (gnu packages check) - #:use-module (gnu packages mp3)) + #:use-module (gnu packages mp3) + #:use-module (gnu packages xorg)) (define-public nicotine+ (package (name "nicotine+") - (version "2.1.2") + (version "3.2.1") (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 "18rra8yqjr10z23chzcp53ncbd5fhm0iqgqxpbxfq7a10za02v6l")))) + (sha256 (base32 "1x08z5lvkdl62dkc11vrsackgzsh1vr9vp3vgsgfzjyrvlsybmfw")) + (modules '((guix build utils))) + (snippet '(begin + (delete-file-recursively "test/integration"))))) (build-system python-build-system) (arguments `(#:imported-modules ((guix build glib-or-gtk-build-system) @@ -55,18 +62,20 @@ (define-public nicotine+ "/bin/nicotine")) (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) (wrap-program prog - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))) - #t))) + `("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))))) + (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 gtk+ python-pygobject python-pytaglib)) + (list bash-minimal gspell gtk+ python-pygobject libappindicator python-pytaglib)) (native-inputs - `(("python-pytest" ,python-pytest) - ("gettext" ,gettext-minimal))) - (home-page "https://nicotine-plus.github.io/nicotine-plus/") + (list gettext-minimal xvfb-run)) + (home-page "https://nicotine-plus.org/") (synopsis "Graphical client for Soulseek") (description "Nicotine+ is a graphical client for the Soulseek peer-to-peer