From 66a4a5ecb23832cde158b3f71cb941a830b66eef Mon Sep 17 00:00:00 2001 From: Fatima Toothpaste Date: Mon, 14 Mar 2022 00:41:24 +0900 Subject: gnu : nicotine+: Update to 3.2.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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. Signed-off-by: Ludovic Courtès --- gnu/packages/nicotine.scm | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/nicotine.scm b/gnu/packages/nicotine.scm index 8e194697de..08232c2756 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 @@ #: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))) + ;; Remove test that relies on network access. + (snippet '(delete-file-recursively "test/integration")))) (build-system python-build-system) (arguments `(#:imported-modules ((guix build glib-or-gtk-build-system) @@ -55,18 +62,20 @@ "/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 -- cgit v1.2.3