GNU bug report logs - #54273
[PATCH] gnu: nicotine+: update to 3.2.1.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 54273 in the body.
You can then email your comments to 54273 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Fatima Toothpaste <fatimatoothpaste <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: Fatima Toothpaste <fatimatoothpaste <at> disroot.org>
Subject: [PATCH] gnu: nicotine+: update to 3.2.1.
Date: Sun,  6 Mar 2022 14:45:51 +0900

* gnu/packages/nicotine.scm (nicotine+): Update to 3.2.1.
  [arguments]: Delete check phase.
  [inputs]: Add bash-minimal.
  [home-page]: Update URL.
---
 gnu/packages/nicotine.scm | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/nicotine.scm b/gnu/packages/nicotine.scm
index 8e194697de..6890c26cb6 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 <mjbecze <at> riseup.net>
+;;; Copyright © 2022 Fatima Toothpaste <fatimatoothpaste <at> disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -21,6 +22,7 @@ (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)
@@ -30,14 +32,14 @@ (define-module (gnu packages nicotine)
 (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"))))
     (build-system python-build-system)
     (arguments
      `(#:imported-modules ((guix build glib-or-gtk-build-system)
@@ -60,13 +62,16 @@ (define-public nicotine+
          (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))
+         ;;Tests require network connection
+         (delete 'check))))
     (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/")
+    (home-page "https://nicotine-plus.org/nicotine-plus/")
     (synopsis "Graphical client for Soulseek")
     (description
      "Nicotine+ is a graphical client for the Soulseek peer-to-peer
-- 
2.34.0

Message #8 received at 54273 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Fatima Toothpaste <fatimatoothpaste <at> disroot.org>
Cc: 54273 <at> debbugs.gnu.org
Subject: Re: bug#54273: [PATCH] gnu: nicotine+: update to 3.2.1.
Date: Fri, 11 Mar 2022 23:11:46 +0100

Hi,

Fatima Toothpaste <fatimatoothpaste <at> disroot.org> skribis:

> * gnu/packages/nicotine.scm (nicotine+): Update to 3.2.1.
>   [arguments]: Delete check phase.
>   [inputs]: Add bash-minimal.
>   [home-page]: Update URL.

[...]

> +         ;;Tests require network connection
> +         (delete 'check))))

Tests should rather be disabled with #:tests? #f.

However, could you check if we can just skip (or tweak?) the tests that
specifically depend on networking?

The rest of the patch looks good to me.

Thanks,
Ludo’.

Message #11 received at 54273 <at> debbugs.gnu.org (full text, mbox):

From: Fatima Toothpaste <fatimatoothpaste <at> disroot.org>
To: 54273 <at> debbugs.gnu.org
Cc: Fatima Toothpaste <fatimatoothpaste <at> disroot.org>
Subject: [PATCH V2] gnu : nicotine+: Update to 3.2.1.
Date: Sat, 12 Mar 2022 22:59:58 +0900

* 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 <mjbecze <at> riseup.net>
+;;; Copyright © 2022 Fatima Toothpaste <fatimatoothpaste <at> 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
-- 
2.34.0

Message #14 received at 54273 <at> debbugs.gnu.org (full text, mbox):

From: Fatima Toothpaste <fatimatoothpaste <at> disroot.org>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 54273 <at> debbugs.gnu.org
Subject: Re: bug#54273: [PATCH] gnu: nicotine+: update to 3.2.1.
Date: Sun, 13 Mar 2022 10:14:11 +0900

Sorry, I fixed what you said, and other messes i made.
Thanks for reviewing.

On 3/12/22 07:11, Ludovic Courtès wrote:
> Hi,
>
> Fatima Toothpaste <fatimatoothpaste <at> disroot.org> skribis:
>
>> * gnu/packages/nicotine.scm (nicotine+): Update to 3.2.1.
>>    [arguments]: Delete check phase.
>>    [inputs]: Add bash-minimal.
>>    [home-page]: Update URL.
> [...]
>
>> +         ;;Tests require network connection
>> +         (delete 'check))))
> Tests should rather be disabled with #:tests? #f.
>
> However, could you check if we can just skip (or tweak?) the tests that
> specifically depend on networking?
>
> The rest of the patch looks good to me.
>
> Thanks,
> Ludo’.

Message #17 received at 54273 <at> debbugs.gnu.org (full text, mbox):

From: Fatima Toothpaste <fatimatoothpaste <at> disroot.org>
To: ludo <at> gnu.org
Cc: 54273 <at> debbugs.gnu.org, Fatima Toothpaste <fatimatoothpaste <at> disroot.org>
Subject: [PATCH V2] gnu : nicotine+: Update to 3.2.1.
Date: Sun, 13 Mar 2022 10:14:14 +0900

* 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 <mjbecze <at> riseup.net>
+;;; Copyright © 2022 Fatima Toothpaste <fatimatoothpaste <at> 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
-- 
2.34.0

Message #20 received at 54273 <at> debbugs.gnu.org (full text, mbox):

From: Maxime Devos <maximedevos <at> telenet.be>
To: Fatima Toothpaste <fatimatoothpaste <at> disroot.org>, ludo <at> gnu.org
Cc: 54273 <at> debbugs.gnu.org
Subject: Re: [bug#54273] [PATCH V2] gnu : nicotine+: Update to 3.2.1.
Date: Sun, 13 Mar 2022 12:06:10 +0100

[Message part 1 (text/plain, inline)]

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.

[signature.asc (application/pgp-signature, inline)]

Message #23 received at 54273 <at> debbugs.gnu.org (full text, mbox):

From: Fatima Toothpaste <fatimatoothpaste <at> disroot.org>
To: Maxime Devos <maximedevos <at> telenet.be>, ludo <at> gnu.org
Cc: 54273 <at> debbugs.gnu.org
Subject: Re: [bug#54273] [PATCH V2] gnu : nicotine+: Update to 3.2.1.
Date: Mon, 14 Mar 2022 00:45:03 +0900

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?

Message #26 received at 54273 <at> debbugs.gnu.org (full text, mbox):

From: Fatima Toothpaste <fatimatoothpaste <at> disroot.org>
To: maximedevos <at> telenet.be,
	ludo <at> gnu.org
Cc: 54273 <at> debbugs.gnu.org, Fatima Toothpaste <fatimatoothpaste <at> disroot.org>
Subject: [PATCH V3] gnu : nicotine+: Update to 3.2.1.
Date: Mon, 14 Mar 2022 00:41:24 +0900

* 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 <mjbecze <at> riseup.net>
+;;; Copyright © 2022 Fatima Toothpaste <fatimatoothpaste <at> disroot.org>
 ;;;
 ;;; 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
-- 
2.34.0

Message #31 received at 54273-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Fatima Toothpaste <fatimatoothpaste <at> disroot.org>
Cc: maximedevos <at> telenet.be, 54273-done <at> debbugs.gnu.org
Subject: Re: bug#54273: [PATCH] gnu: nicotine+: update to 3.2.1.
Date: Tue, 15 Mar 2022 10:52:33 +0100

Hi,

Fatima Toothpaste <fatimatoothpaste <at> disroot.org> skribis:

> * 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.

[...]

> +              (snippet '(begin
> +                          (delete-file-recursively "test/integration")))))

I added a comment above the snippet explaining it and applied.

Thanks,
Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.