[bug#58125] [PATCH] gnu: Add nm-tray

[bug#58125] [PATCH] gnu: Add nm-tray

[Pavel Shlyak]

[-- Attachment #1: 0001-gnu-Add-nm-tray.patch --]
[-- Type: application/octet-stream, Size: 3041 bytes --]

From eec3ce8bcda1317c05e4e61d67f54ef7a20f0823 Mon Sep 17 00:00:00 2001
From: Pavel Shlyak <p.shlyak@pantherx.org>
Date: Tue, 27 Sep 2022 23:45:08 +0300
Subject: [PATCH] gnu: Add nm-tray * gnu/packages/networking.scm (nm-tray): New
 variable.

---
 gnu/packages/networking.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 3d9ba4fc8d..75c73f578a 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -40,6 +40,7 @@
 ;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com>
 ;;; Copyright © 2020 Hamzeh Nasajpour <h.nasajpour@pantherx.org>
 ;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2020-2022 PantherX OS Team <team@pantherx.org>
 ;;; Copyright © 2021 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li>
 ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
@@ -80,6 +81,7 @@ (define-module (gnu packages networking)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system qt)
   #:use-module (guix build-system trivial)
   #:use-module (guix utils)
   #:use-module (gnu packages)
@@ -115,6 +117,7 @@ (define-module (gnu packages networking)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages libusb)
@@ -973,6 +976,30 @@ (define-public blueman
     (home-page "https://github.com/blueman-project/blueman")
     (license license:gpl3+)))
 
+(define-public nm-tray
+  (package
+   (name "nm-tray")
+   (version "0.5.0")
+   (home-page "https://github.com/palinek/nm-tray")
+   (source
+    (origin
+     (method git-fetch)
+     (uri (git-reference
+	   (url home-page)
+           (commit version)
+	   (recursive? #t)))
+     (sha256
+      (base32 "14i8sl0hrnyidlvqnxza0v4018f7p685ksn8419i2w7f9yqpvpiw"))
+     (file-name (git-file-name name version))))
+   (build-system qt-build-system)
+   (arguments (list #:tests? #f))  ; There are no tests upstream
+   (inputs (list qtbase-5 networkmanager-qt modemmanager-qt))
+   (native-inputs (list qttools-5 pkg-config))
+   (synopsis "NetworkManager front end with information icon residing in system tray")
+   (description "nm-tray is a network connection management tool (NetworkManager front end)
+with information icon residing in system tray (like e.g. nm-applet).")
+   (license license:gpl2+)))
+
 ;; The gnu.org ‘home’ for this GNU project is a directory listing with 1.6.0 as
 ;; the latest version.  The author's git repository, mentioned in the 1.6.0
 ;; README and otherwise legit-looking, contains a proper 1.7.0 release tarball
-- 
2.37.0 (Apple Git-136)

[bug#58125] [PATCH] gnu: Add nm-tray

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 2278 bytes --]

> Subject: [PATCH] gnu: Add nm-tray * gnu/packages/networking.scm (nm-tray): New
>  variable.

Except for the initial line(?), the commit message is for tor the 
Subject line (-:.

On 27-09-2022 22:49, Pavel Shlyak wrote:

 > + ;;; Copyright © 2020-2022 PantherX OS Team <team@pantherx.org>

Please write the actual copyright holder (likely the relevant members of 
this team or perhaps their employer, depending on how things are set up) 
-- AFAIK, "PantherX OS Team" is a not some legal entity that can hold 
copyright.

In both cases, I think we should investigate whether something like 
<https://www.samba.org/samba/devel/copyright-policy.html> should be done 
in Guix first.

 > +++ b/gnu/packages/networking.scm
 > +  #:use-module (gnu packages kde-frameworks)

I don't think this module should unconditionally import that, to help 
with keeping "guix ... package" fast when the kde-frameworks isn't 
actually used.

I have tried out some tricks in <https://issues.guix.gnu.org/54539> -- 
while there doesn't seem to have been any conclusion on what's the 
'proper' trick, there are some options -- see, e.g., how 
https://issues.guix.gnu.org/57861 uses module-ref.


> +   (synopsis "NetworkManager front end with information icon residing in system tray")
> +   (description "nm-tray is a network connection management tool (NetworkManager front end)
> +with information icon residing in system tray (like e.g. nm-applet).")

Could you add some information, more specifically something to 
distinguish nm-applet from nm-applet?  Currently, it doesn't give any 
information that helps the user with choosing between nm-tray nad nm-applet.

> +	   (recursive? #t)))

Why? AFAICT, there are no git submodules.

Looking through the source code, it appears to use icons.  Can you test 
that icons are displayed properly in a pure environment ("guix shell 
--pure nm-tray -- ...")?  Sometimes graphical software doesn't find its 
icons without some help.

Looking at CMakeLists.txt, it comes with optional modem manager support, 
for which you seem to have added modemmanager-qt, but from reading 
CMakeLists.txt, it doesn't seem to be enabled by default, could you set 
WITH_MODEMMANAGER_SUPPORT?

Greetings,
Maxime.

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

[bug#58125] [PATCH] gnu: Add nm-tray

[Pavel Shlyak]

[-- Attachment #1: Type: text/plain, Size: 3582 bytes --]

> Except for the initial line(?), the commit message is for tor the Subject line (-:.

I didn’t get you

> Please write the actual copyright holder (likely the relevant members of this team or perhaps their employer, depending on how things are set up) -- AFAIK, "PantherX OS Team" is a not some legal entity that can hold copyright.

Done

> I don't think this module should unconditionally import that, to help with keeping "guix ... package" fast when the kde-frameworks isn't actually used.

I didn’t get that, too

> Could you add some information, more specifically something to distinguish nm-applet from nm-applet?  Currently, it doesn't give any information that helps the user with choosing between nm-tray nad nm-applet.

Done

> Why? AFAICT, there are no git submodules.

True

>  Can you test that icons are displayed properly in a pure environment ("guix shell --pure nm-tray -- …»)?

They are not. I don’t know how to get them to work.

> could you set WITH_MODEMMANAGER_SUPPORT?

It looks like it’s not yet implemented in the app. Instead, I have removed modem manager from inputs.



> 29 сент. 2022 г., в 19:29, Maxime Devos <maximedevos@telenet.be> написал(а):
> 
>> Subject: [PATCH] gnu: Add nm-tray * gnu/packages/networking.scm (nm-tray): New
>> variable.
> 
> Except for the initial line(?), the commit message is for tor the Subject line (-:.
> 
> On 27-09-2022 22:49, Pavel Shlyak wrote:
> 
> > + ;;; Copyright © 2020-2022 PantherX OS Team <team@pantherx.org>
> 
> Please write the actual copyright holder (likely the relevant members of this team or perhaps their employer, depending on how things are set up) -- AFAIK, "PantherX OS Team" is a not some legal entity that can hold copyright.
> 
> In both cases, I think we should investigate whether something like <https://www.samba.org/samba/devel/copyright-policy.html> should be done in Guix first.
> 
> > +++ b/gnu/packages/networking.scm
> > +  #:use-module (gnu packages kde-frameworks)
> 
> I don't think this module should unconditionally import that, to help with keeping "guix ... package" fast when the kde-frameworks isn't actually used.
> 
> I have tried out some tricks in <https://issues.guix.gnu.org/54539> -- while there doesn't seem to have been any conclusion on what's the 'proper' trick, there are some options -- see, e.g., how https://issues.guix.gnu.org/57861 uses module-ref.
> 
> 
>> +   (synopsis "NetworkManager front end with information icon residing in system tray")
>> +   (description "nm-tray is a network connection management tool (NetworkManager front end)
>> +with information icon residing in system tray (like e.g. nm-applet).")
> 
> Could you add some information, more specifically something to distinguish nm-applet from nm-applet?  Currently, it doesn't give any information that helps the user with choosing between nm-tray nad nm-applet.
> 
>> +	   (recursive? #t)))
> 
> Why? AFAICT, there are no git submodules.
> 
> Looking through the source code, it appears to use icons.  Can you test that icons are displayed properly in a pure environment ("guix shell --pure nm-tray -- ...")?  Sometimes graphical software doesn't find its icons without some help.
> 
> Looking at CMakeLists.txt, it comes with optional modem manager support, for which you seem to have added modemmanager-qt, but from reading CMakeLists.txt, it doesn't seem to be enabled by default, could you set WITH_MODEMMANAGER_SUPPORT?
> 
> Greetings,
> Maxime.
> <OpenPGP_0x49E3EE22191725EE.asc>


[-- Attachment #2.1: Type: text/html, Size: 4118 bytes --]

[-- Attachment #2.2: 0001-gnu-Add-nm-tray.patch --]
[-- Type: application/octet-stream, Size: 3632 bytes --]

From a9473671cbbcf7c97495a4d65070006feb80f09b Mon Sep 17 00:00:00 2001
From: Pavel Shlyak <p.shlyak@pantherx.org>
Date: Tue, 27 Sep 2022 23:45:08 +0300
Subject: [PATCH] gnu: Add nm-tray

* gnu/packages/networking.scm (nm-tray): New variable.
---
 gnu/packages/networking.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 3d9ba4fc8d..378651e100 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -40,6 +40,7 @@
 ;;; Copyright © 2020 Jesse Dowell <jessedowell@gmail.com>
 ;;; Copyright © 2020 Hamzeh Nasajpour <h.nasajpour@pantherx.org>
 ;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2021 Fakhri Sajadi <f.sajadi@pantherx.org>
 ;;; Copyright © 2021 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li>
 ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net>
@@ -48,9 +49,11 @@
 ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
 ;;; Copyright © 2022 Simon South <simon@simonsouth.net>
+;;; Copyright © 2022 Pavel Shlyak <p.shlyak@pantherx.org>
 ;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2022 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
+;;; Copyright © 2022 Reza Alizadeh Majd <r.majd@pantherx.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -80,6 +83,7 @@ (define-module (gnu packages networking)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system qt)
   #:use-module (guix build-system trivial)
   #:use-module (guix utils)
   #:use-module (gnu packages)
@@ -115,6 +119,7 @@ (define-module (gnu packages networking)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
+  #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages libusb)
@@ -973,6 +978,30 @@ (define-public blueman
     (home-page "https://github.com/blueman-project/blueman")
     (license license:gpl3+)))
 
+(define-public nm-tray
+  (package
+   (name "nm-tray")
+   (version "0.5.0")
+   (home-page "https://github.com/palinek/nm-tray")
+   (source
+    (origin
+     (method git-fetch)
+     (uri (git-reference
+	   (url home-page)
+           (commit version)))
+     (sha256
+      (base32 "14i8sl0hrnyidlvqnxza0v4018f7p685ksn8419i2w7f9yqpvpiw"))
+     (file-name (git-file-name name version))))
+   (build-system qt-build-system)
+   (arguments (list #:tests? #f))  ; There are no tests upstream
+   (inputs (list qtbase-5 networkmanager-qt))
+   (native-inputs (list qttools-5 pkg-config))
+   (synopsis "NetworkManager front end with information icon residing in system tray")
+   (description "nm-tray is a network connection management tool (NetworkManager front end)
+with information icon residing in system tray. Unlike nm-applet,
+that is part of gnome, this app is desktop-unaware.")
+   (license license:gpl2+)))
+
 ;; The gnu.org ‘home’ for this GNU project is a directory listing with 1.6.0 as
 ;; the latest version.  The author's git repository, mentioned in the 1.6.0
 ;; README and otherwise legit-looking, contains a proper 1.7.0 release tarball
-- 
2.37.0 (Apple Git-136)


[-- Attachment #2.3: Type: text/html, Size: 3867 bytes --]

[bug#58125] [PATCH] gnu: Add nm-tray

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 5843 bytes --]

On 05-10-2022 16:46, Pavel Shlyak wrote:
>> Except for the initial line(?), the commit message is for tor the Subject line (-:.
> 
> I didn’t get you

Oops, I meant ‘Except for the initial line(?), the commit message is for 
tor the Subject line (-:.’, no Tor involved.  Your patch looked like this:

Subject: [PATCH] gnu: Add nm-tray * gnu/packages/networking.scm 
(nm-tray): New
  variable.


>  > Please write the actual copyright holder (likely the relevant members 
> of this team or perhaps their employer, depending on how things are set 
> up) -- AFAIK, "PantherX OS Team" is a not some legal entity that can 
> hold copyright.
> 
> Done

Looks ok, though I think it's best to get some formal confirmation from 
the employer (see: the Samba link).

> 
>> I don't think this module should unconditionally import that, to help 
> with keeping "guix ... package" fast when the kde-frameworks isn't 
> actually used.
> 
> I didn’t get that, too

I don't have any additional explanation to give and I gave you an 
example with the reference to 57861.

>> Could you add some information, more specifically something to 
> distinguish nm-applet from nm-applet?  Currently, it doesn't give any 
> information that helps the user with choosing between nm-tray nad nm-applet.
> 
> Done

 > Unlike nm-applet, that is part of gnome, this app is desktop-unaware.

IIUC, standard capitalisation is GNOME, not gnome.

Also,

   (1) being unaware of desktops doesn't sound like an upside to me.
       Mentioning downsides too is good, but currently nm-tray sounds
       strictly worse than than nm-applet.
   (2) doing a cursory look through nm-applet, it appears to be desktop-
       unaware too -- yes, it's part of GNOME, but nevertheless it
       doesn't seem to care which desktop environment it is run in.

       For example, it looks like it runs just fine in KDE:
 
<https://fedoraproject.org/wiki/KDE/Using_nm_applet_instead_of_knetworkmanager>

If you meant that it has a Qt-ish interface instead of a GTK-ish 
interface (which can be good for consistency) you could write something 
like 'Unlike nm-applet, this application uses Qt instead of GTK for 
graphical interfaces, to better fit in with other Qt-based applications.’.

>> Why? AFAICT, there are no git submodules.
> 
> True
> 
>>   Can you test that icons are displayed properly in a pure environment 
> ("guix shell --pure nm-tray -- …»)?
> 
> They are not. I don’t know how to get them to work.

You are using qt-build-system, so in theory the required wrapping is 
done automatically via wrap-all-qt-programs.

Also, with 'icons', I meant 'icons', not .desktop (I've heard at least a 
single case where someone wrote 'icons' but meant .desktop).

> 
>> could you set WITH_MODEMMANAGER_SUPPORT?
> 
> It looks like it’s not yet implemented in the app. Instead, I have 
> removed modem manager from inputs.

OK.

> 
>> 29 сент. 2022 г., в 19:29, Maxime Devos <maximedevos@telenet.be 
>> <mailto:maximedevos@telenet.be>> написал(а):
>>
>>> Subject: [PATCH] gnu: Add nm-tray * gnu/packages/networking.scm 
>>> (nm-tray): New
>>> variable.
>>
>> Except for the initial line(?), the commit message is for tor the 
>> Subject line (-:.
>>
>> On 27-09-2022 22:49, Pavel Shlyak wrote:
>>
>> > + ;;; Copyright © 2020-2022 PantherX OS Team <team@pantherx.org 
>> <mailto:team@pantherx.org>>
>>
>> Please write the actual copyright holder (likely the relevant members 
>> of this team or perhaps their employer, depending on how things are 
>> set up) -- AFAIK, "PantherX OS Team" is a not some legal entity that 
>> can hold copyright.
>>
>> In both cases, I think we should investigate whether something like 
>> <https://www.samba.org/samba/devel/copyright-policy.html 
>> <https://www.samba.org/samba/devel/copyright-policy.html>> should be 
>> done in Guix first.
>>
>> > +++ b/gnu/packages/networking.scm
>> > +  #:use-module (gnu packages kde-frameworks)
>>
>> I don't think this module should unconditionally import that, to help 
>> with keeping "guix ... package" fast when the kde-frameworks isn't 
>> actually used.
>>
>> I have tried out some tricks in <https://issues.guix.gnu.org/54539 
>> <https://issues.guix.gnu.org/54539>> -- while there doesn't seem to 
>> have been any conclusion on what's the 'proper' trick, there are some 
>> options -- see, e.g., how https://issues.guix.gnu.org/57861 
>> <https://issues.guix.gnu.org/57861> uses module-ref.
>>
>>
>>> +   (synopsis "NetworkManager front end with information icon 
>>> residing in system tray")
>>> +   (description "nm-tray is a network connection management tool 
>>> (NetworkManager front end)
>>> +with information icon residing in system tray (like e.g. nm-applet).")
>>
>> Could you add some information, more specifically something to 
>> distinguish nm-applet from nm-applet?  Currently, it doesn't give any 
>> information that helps the user with choosing between nm-tray nad 
>> nm-applet.
>>
>>> +  (recursive? #t)))
>>
>> Why? AFAICT, there are no git submodules.
>>
>> Looking through the source code, it appears to use icons.  Can you 
>> test that icons are displayed properly in a pure environment ("guix 
>> shell --pure nm-tray -- ...")?  Sometimes graphical software doesn't 
>> find its icons without some help.
>>
>> Looking at CMakeLists.txt, it comes with optional modem manager 
>> support, for which you seem to have added modemmanager-qt, but from 
>> reading CMakeLists.txt, it doesn't seem to be enabled by default, 
>> could you set WITH_MODEMMANAGER_SUPPORT?
>>
>> Greetings,
>> Maxime.
>> <OpenPGP_0x49E3EE22191725EE.asc>

You quoted a bit too much here.

Greetings,
Maxime.

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

bug#58125: [PATCH] gnu: Add nm-tray

[Ludovic Courtès]

Hi,

Pavel Shlyak <p.shlyak@pantherx.org> skribis:

> From a9473671cbbcf7c97495a4d65070006feb80f09b Mon Sep 17 00:00:00 2001
> From: Pavel Shlyak <p.shlyak@pantherx.org>
> Date: Tue, 27 Sep 2022 23:45:08 +0300
> Subject: [PATCH] gnu: Add nm-tray
>
> * gnu/packages/networking.scm (nm-tray): New variable.

I passed it through ‘guix style’, tweaked the description as Maxime
suggested, and committed.

Thanks!

Ludo’.