From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6OwiIQLFLGJSKgEAgWs5BA (envelope-from ) for ; Sat, 12 Mar 2022 17:06:26 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id WAnMHQLFLGK2/QAAauVa8A (envelope-from ) for ; Sat, 12 Mar 2022 17:06:26 +0100 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 E5C23D841 for ; Sat, 12 Mar 2022 17:06:25 +0100 (CET) Received: from localhost ([::1]:39732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nT4G8-00015K-N5 for larch@yhetil.org; Sat, 12 Mar 2022 11:06:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nT4Fn-00014w-HR for guix-patches@gnu.org; Sat, 12 Mar 2022 11:06:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46770) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nT4Fm-0000ls-Gw for guix-patches@gnu.org; Sat, 12 Mar 2022 11:06:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nT4Fm-0005ap-Br for guix-patches@gnu.org; Sat, 12 Mar 2022 11:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54273] [PATCH V2] 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: Sat, 12 Mar 2022 16:06: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: 54273@debbugs.gnu.org Cc: Fatima Toothpaste Received: via spool by 54273-submit@debbugs.gnu.org id=B54273.164710115721473 (code B ref 54273); Sat, 12 Mar 2022 16:06:02 +0000 Received: (at 54273) by debbugs.gnu.org; 12 Mar 2022 16:05:57 +0000 Received: from localhost ([127.0.0.1]:40666 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nT4Fg-0005aG-N0 for submit@debbugs.gnu.org; Sat, 12 Mar 2022 11:05:57 -0500 Received: from knopi.disroot.org ([178.21.23.139]:36778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nT2J9-0002Cr-Ip for 54273@debbugs.gnu.org; Sat, 12 Mar 2022 09:01:24 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 36396400C4; Sat, 12 Mar 2022 15:01:22 +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 UTF8SMTP id HK3FamyrYUoi; Sat, 12 Mar 2022 15:01:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1647093675; bh=e/PPCS7m1QSMRe6k6QoxOAAAaQ+Yu8nIFBjE39ZjT90=; h=From:To:Cc:Subject:Date; b=Il7zBGLquvzmYUo7MVcqGu4pUgYWRlluP1E1l3iYIz5AcmQqrWcFbSUoduJsJWX1z MRWZnBx+aNAzb88SjaB+1vEjwJNZ8o7ryXHyrvS8uWLBJyZ3nPDDi6UcdorZY3H2TX mdgYZU/4qQgycierIli83qRLARDlYwjb3//ob9xEE7hyrsAwYBzmwwpEdsr7A+zJ9m XSUt1itvIO/I0lmqflnIqk7a8FH+WXnPKMurcl08sphYRsxPZcSooGZl4W3RaxEHd0 ks3UN6TjS5AyjnWHZq06Yyrm4qomcf8QuDus22w00K+qJguTvW551J+9U116ryW2tY rSfVRaQq+mNYw== Date: Sat, 12 Mar 2022 22:59:58 +0900 Message-Id: <20220312135958.5627-1-fatimatoothpaste@disroot.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Sat, 12 Mar 2022 11:05:55 -0500 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Fatima Toothpaste X-ACL-Warn: , Fatima Toothpaste via Guix-patches From: Fatima Toothpaste via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1647101186; 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-type:content-type: 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=qGKhusQ2OFxMXX3ZPwmlvfK1PJ+juR9Cz6MMLlRP59Y=; b=VynSjx5Hz+vOg1qCFhzV+i7MdVyFRFmIDgNmEABN5iRd9gclq2nUsatN4y8cwAC2e/CeXi u+4rh1iHiODCMfHDJ0/HefHSWjp54rGivSeEm91umQJEOjUcAixXAwECm0NFPL07pVvTAV 1mqT41rpN9gVXqq97VdJplSaeBNdEYzO5pL2nADS6yYTlyFNsz2mhHCWhUJs8Vb1lh5RKk r3qV7ax00+wHN4pQeImjJoNU310fz0hEYJDRZLrumoGA0Sjr3B5twjeH17IveMLh7H7zKF chMRSM9zJRx5v73OiMjUdQy+svO+Pg+m381ayagH//VXfZbRJGVpYwHXF6UjNw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1647101186; a=rsa-sha256; cv=none; b=M15Dc3aNvLEo3+5gdxPx/IMBGeIxyXWv1eWgxHKRhIIcB8UvYg2IbU/sP6tGP50UK+Ly8P gFrZZAQI8JW0lyRMseB4oFlm7LDVZJ4/py5iCx3PuD7ZfcOXB0bSOjKTOHgz1rHlezizuP BXfyUO8/Q+eQRaoWlPCuM3cDImUes2NG3ocWoHhby2hADkNc/JDohCjl15WTvrroIkRXNN x6G774YTBpzahDOxaq9lDYUqvanaYSvVfX03l5SaXfJMNEzcs5CdDTHGWxH1tVbaptL8kl gfORlBEcuvovliEyR5Mgz07qguVIOWgJSOfSgM6U0kXmHLhxfz7QpeqP2A/D/w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=Il7zBGLq; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -3.49 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=Il7zBGLq; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: E5C23D841 X-Spam-Score: -3.49 X-Migadu-Scanner: scn0.migadu.com X-TUID: c7d2mf33xLrz * gnu/packages/nicotine.scm (nicotine+): Update to 3.2.1. [source]: Delete network requried tests in snippet. [arguments]: Remove trailing #t. Replae 'check to use python unittest module. [inputs]: Add bash-minimal. [native-inputs]: Remove python-pytest. Add python. [home-page]: Update URL. --- gnu/packages/nicotine.scm | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/gnu/packages/nicotine.scm b/gnu/packages/nicotine.scm index 8e194697de..62ad2bb9bf 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,27 @@ (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 glib) #: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 python)) (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 +60,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 _ + (invoke "python" "-m" "unittest")))))) (inputs - (list gtk+ python-pygobject python-pytaglib)) + ;;TODO: Add libayatana-appindicator + (list bash-minimal gtk+ python-pygobject python-pytaglib)) (native-inputs - `(("python-pytest" ,python-pytest) - ("gettext" ,gettext-minimal))) - (home-page "https://nicotine-plus.github.io/nicotine-plus/") + (list python gettext-minimal)) + (home-page "https://nicotine-plus.org/") (synopsis "Graphical client for Soulseek") (description "Nicotine+ is a graphical client for the Soulseek peer-to-peer -- 2.34.0