all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Fatima Toothpaste via Guix-patches via <guix-patches@gnu.org>
To: maximedevos@telenet.be, ludo@gnu.org
Cc: 54273@debbugs.gnu.org, Fatima Toothpaste <fatimatoothpaste@disroot.org>
Subject: [bug#54273] [PATCH V3] gnu : nicotine+: Update to 3.2.1.
Date: Mon, 14 Mar 2022 00:41:24 +0900	[thread overview]
Message-ID: <20220313154124.18317-1-fatimatoothpaste@disroot.org> (raw)
In-Reply-To: <20220306054551.19383-1-fatimatoothpaste@disroot.org>

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





  parent reply	other threads:[~2022-03-13 15:46 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-06  5:45 [bug#54273] [PATCH] gnu: nicotine+: update to 3.2.1 Fatima Toothpaste via Guix-patches via
2022-03-11 22:11 ` Ludovic Courtès
2022-03-13  1:14   ` Fatima Toothpaste via Guix-patches via
2022-03-12 13:59 ` [bug#54273] [PATCH V2] gnu : nicotine+: Update " Fatima Toothpaste via Guix-patches via
2022-03-13  1:14 ` Fatima Toothpaste via Guix-patches via
2022-03-13 11:06   ` Maxime Devos
2022-03-13 15:45     ` Fatima Toothpaste via Guix-patches via
2022-03-13 15:41 ` Fatima Toothpaste via Guix-patches via [this message]
2022-03-15  9:52   ` bug#54273: [PATCH] gnu: nicotine+: update " Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220313154124.18317-1-fatimatoothpaste@disroot.org \
    --to=guix-patches@gnu.org \
    --cc=54273@debbugs.gnu.org \
    --cc=fatimatoothpaste@disroot.org \
    --cc=ludo@gnu.org \
    --cc=maximedevos@telenet.be \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.