[bug#54273,V2] gnu : nicotine+: Update to 3.2.1.
Commit Message
* 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(-)
Comments
Fatima Toothpaste via Guix-patches via schreef op zo 13-03-2022 om
10:14 [+0900]:
> + (replace 'check
> + (lambda _
> + (invoke "python" "-m" "unittest"))))))
"./pre-inst-env guix lint nicotine+" would warn about this.
To make the '--without-tests' package transformatin work, this needs to
be:
> + (replace 'check
> + (lambda* (#:key tests? #:allow-other-keys)
> + (when tests?
> + (invoke "python" "-m" "unittest")))))))
Greetings,
Maxime.
Sorry, I forgot to lint. By the way, I also included some optional
dependencies on new patch, which i excluded on purpose before.
gspell: spell checking doesn't work on my machine. However, gtk and
gspell both are loaded with pygobject, and gtk works fine. so it might
be the problem of nicotine+, or might work on other environment.
libappindicator: i excluded it because i heard it is unmaintained and
should be replaced with libayatana-appindicator. But, still though there
are some packages depend on libappindicator in guix. So, Just using
libappindicator for a now and replacing it all together with
libayatana-appindicator someday doesn't seems so bad to me, What do you
think?
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;; Copyright © 2022 Fatima Toothpaste <fatimatoothpaste@disroot.org>
;;;
;;; 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