[PATCH 1/2] gnu: tor: Use ‘license:’ prefix instead of #:select.

[PATCH 1/2] gnu: tor: Use ‘license:’ prefix instead of #:select.

[Tobias Geerinckx-Rice]

* gnu/packages/tor.scm (tor, torsocks, privoxy, onionshare)[license]:
Add prefix.
---
 gnu/packages/tor.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index c7f97ab..97e7ec9 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -20,7 +20,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages tor)
-  #:use-module ((guix licenses) #:select (bsd-3 gpl3+ gpl2+ gpl2))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
@@ -69,7 +69,7 @@ To @code{torify} applications (to take measures to ensure that an application,
 which has not been designed for use with Tor such as ssh, will use only Tor for
 internet connectivity, and also ensures that there are no leaks from DNS, UDP or
 the application layer) you need to install @code{torsocks}.")
-    (license bsd-3)))
+    (license license:bsd-3)))
 
 (define-public torsocks
   (package
@@ -91,7 +91,7 @@ way with Tor.  It ensures that DNS requests are handled safely and explicitly
 rejects UDP traffic from the application you're using.")
 
     ;; All the files explicitly say "version 2 only".
-    (license gpl2)))
+    (license license:gpl2)))
 
 (define-public privoxy
   (package
@@ -135,7 +135,7 @@ access, and removing ads and other obnoxious Internet junk.  Privoxy has a
 flexible configuration and can be customized to suit individual needs and
 tastes.  It has application for both stand-alone systems and multi-user
 networks.")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-public onionshare
   (package
@@ -221,5 +221,5 @@ using a third party filesharing service.  You host the file on your own computer
 and use a Tor hidden service to make it temporarily accessible over the
 internet.  The other user just needs to use Tor Browser to download the file
 from you.")
-    (license (list gpl3+
-                   bsd-3)))) ; onionshare/socks.py
+    (license (list license:gpl3+
+                   license:bsd-3))))    ; onionshare/socks.py
-- 
2.9.3

[PATCH 2/2] gnu: Add nyx.

[Tobias Geerinckx-Rice]

* gnu/packages/tor.scm (nyx): New variable.
---

Guix,

This adds Nyx (no relation), a handy status monitor for Tor relays.

A 2.0 release has been just around the corner for... more than half a
year now, but the last 1.x version is from 2012. It also had an entirely
different name (‘Arm’) and I'd rather not deal with the confusion.

This one has been nothing but stable for me, so I'd thought I'd share it.

If we instead decide to wait another year for a ‘real’ release, so be it.

Kind regards,

T G-R

gnu/packages/tor.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 97e7ec9..b3b8238 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
+;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -223,3 +224,63 @@ internet.  The other user just needs to use Tor Browser to download the file
 from you.")
     (license (list license:gpl3+
                    license:bsd-3))))    ; onionshare/socks.py
+
+(define-public nyx
+  (let ((commit "fea209127484d9b304b908a4711c9528b1d065bc")
+        (revision "1"))                 ; Guix package revision
+    (package
+      (name "nyx")
+      (version (string-append "1.9-" revision "."
+                              (string-take commit 7)))
+      (source
+       (origin
+         (method git-fetch)
+         (file-name (string-append name "-" version "-checkout"))
+         (uri (git-reference
+               (url "https://git.torproject.org/nyx.git")
+               (commit commit)))
+         (sha256
+          (base32
+           "1g0l4988076xg5gs0x0nxzlg58rfx5g5agmklvyh4yp03vxncdb9"))))
+      (build-system python-build-system)
+      (native-inputs
+       ;; For tests.
+       `(("python-mock" ,python-mock)
+         ("python-pep8" ,python-pep8)
+         ("python-pyflakes" ,python-pyflakes)))
+      (inputs
+       `(("python-stem" ,python-stem)))
+      (arguments
+       `(#:configure-flags
+         (list (string-append "--man-page="
+                              (assoc-ref %outputs "out")
+                              "/share/man/man1/nyx.1")
+               (string-append "--sample-path="
+                              (assoc-ref %outputs "out")
+                              "/share/doc/nyx/nyxrc.sample"))
+         #:use-setuptools? #f           ; setup.py still uses distutils
+         #:phases
+         (modify-phases %standard-phases
+           (replace 'check
+                    (lambda _
+                      (zero? (system* "./run_tests.py" "--unit")))))))
+      ;; There's no home page yet.  This should change before the 2.0 release.
+      (home-page "https://gitweb.torproject.org/nyx.git")
+      (synopsis "Tor relay status monitor")
+      (description "Nyx monitors the performance of relays participating in the
+@uref{https://www.torproject.org/, Tor anonymity network}.  It displays this
+information visually and in real time, using a curses-based terminal interface.
+This makes Nyx well-suited for remote shell connections and servers without a
+graphical display.  It's like @command{top} for Tor, providing detailed
+statistics and status reports on:
+
+@enumerate
+@item connections (with IP address, hostname, fingerprint, and consensus data),
+@item bandwidth, processor, and memory usage,
+@item the relay's current configuration,
+@item logged events,
+@item and much more.
+@end enumerate
+
+Potential client and exit connections are scrubbed of sensitive information.")
+      (license license:gpl3))))
-- 
2.9.3

Re: [PATCH 2/2] gnu: Add nyx.

[ng0]

Tobias Geerinckx-Rice <me@tobias.gr> writes:

> * gnu/packages/tor.scm (nyx): New variable.
> ---
>
> Guix,
>
> This adds Nyx (no relation), a handy status monitor for Tor relays.

Cool!
So it seems you have evaded the problems with the custom setup
phase they have, which I ran into. Strange. But nice.

> A 2.0 release has been just around the corner for... more than half a
> year now, but the last 1.x version is from 2012. It also had an entirely
> different name (‘Arm’) and I'd rather not deal with the confusion.
>
> This one has been nothing but stable for me, so I'd thought I'd share it.
>
> If we instead decide to wait another year for a ‘real’ release, so be it.

I think it's okay, take a look at this search and the reactions I
got about it.
https://lists.gnu.org/archive/cgi-bin/namazu.cgi?query=nyx&submit=Search&idxname=guix-devel
For the git commit you could mention that this used to be called
"arm" and since then has been replaced by "nyx", see the comment
Ludovic gave.

> Kind regards,
>
> T G-R
>
> gnu/packages/tor.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 61 insertions(+)
>
> diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
> index 97e7ec9..b3b8238 100644
> --- a/gnu/packages/tor.scm
> +++ b/gnu/packages/tor.scm
> @@ -3,6 +3,7 @@
>  ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
>  ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
>  ;;; Copyright © 2016, 2017 ng0 <contact.ng0@cryptolab.net>
> +;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -223,3 +224,63 @@ internet.  The other user just needs to use Tor Browser to download the file
>  from you.")
>      (license (list license:gpl3+
>                     license:bsd-3))))    ; onionshare/socks.py
> +
> +(define-public nyx
> +  (let ((commit "fea209127484d9b304b908a4711c9528b1d065bc")
> +        (revision "1"))                 ; Guix package revision
> +    (package
> +      (name "nyx")
> +      (version (string-append "1.9-" revision "."
> +                              (string-take commit 7)))
> +      (source
> +       (origin
> +         (method git-fetch)
> +         (file-name (string-append name "-" version "-checkout"))
> +         (uri (git-reference
> +               (url "https://git.torproject.org/nyx.git")
> +               (commit commit)))
> +         (sha256
> +          (base32
> +           "1g0l4988076xg5gs0x0nxzlg58rfx5g5agmklvyh4yp03vxncdb9"))))
> +      (build-system python-build-system)
> +      (native-inputs
> +       ;; For tests.

I think this comment is not needed.

> +       `(("python-mock" ,python-mock)
> +         ("python-pep8" ,python-pep8)
> +         ("python-pyflakes" ,python-pyflakes)))
> +      (inputs
> +       `(("python-stem" ,python-stem)))
> +      (arguments
> +       `(#:configure-flags
> +         (list (string-append "--man-page="
> +                              (assoc-ref %outputs "out")
> +                              "/share/man/man1/nyx.1")
> +               (string-append "--sample-path="
> +                              (assoc-ref %outputs "out")
> +                              "/share/doc/nyx/nyxrc.sample"))
> +         #:use-setuptools? #f           ; setup.py still uses distutils

Sidecomment: Ah! That's the obvious error I failed to spot when I gave it a try.

> +         #:phases
> +         (modify-phases %standard-phases
> +           (replace 'check
> +                    (lambda _

I think the indendation is wrong here.

> +                      (zero? (system* "./run_tests.py" "--unit")))))))
> +      ;; There's no home page yet.  This should change before the 2.0 release.
> +      (home-page "https://gitweb.torproject.org/nyx.git")
> +      (synopsis "Tor relay status monitor")
> +      (description "Nyx monitors the performance of relays participating in the
> +@uref{https://www.torproject.org/, Tor anonymity network}.  It displays this
> +information visually and in real time, using a curses-based terminal interface.
> +This makes Nyx well-suited for remote shell connections and servers without a
> +graphical display.  It's like @command{top} for Tor, providing detailed
> +statistics and status reports on:
> +
> +@enumerate
> +@item connections (with IP address, hostname, fingerprint, and consensus data),
> +@item bandwidth, processor, and memory usage,
> +@item the relay's current configuration,
> +@item logged events,
> +@item and much more.
> +@end enumerate
> +
> +Potential client and exit connections are scrubbed of sensitive information.")
> +      (license license:gpl3))))
> -- 
> 2.9.3
>
>


-- 
ng0 -- https://www.inventati.org/patternsinthechaos/

Re: [PATCH 2/2] gnu: Add nyx.

[Tobias Geerinckx-Rice]

[-- Attachment #1.1: Type: text/plain, Size: 1223 bytes --]

ng0,

On 30/01/17 07:13, ng0 wrote:
> Tobias Geerinckx-Rice <me@tobias.gr> writes:
>> This adds Nyx (no relation), a handy status monitor for Tor relays.
> 
> Cool!
> So it seems you have evaded the problems with the custom setup
> phase they have, which I ran into. Strange. But nice.
> 
> I think it's okay, take a look at this search and the reactions I
> got about it.
> https://lists.gnu.org/archive/cgi-bin/namazu.cgi?query=nyx&submit=Search&idxname=guix-devel

Oy, that's... so recent I completely missed it? I'm still trudging
through the post-exam backlog & didn't know you'd submitted this too!

> For the git commit you could mention that this used to be called
> "arm" and since then has been replaced by "nyx", see the comment
> Ludovic gave.

Even better. I'll add it to the description field as well.

> Sidecomment: Ah! That's the obvious error I failed to spot when I gave it a try.

If I can get Python packages to work, there's hope for everyone.

>> +         #:phases
>> +         (modify-phases %standard-phases
>> +           (replace 'check
>> +                    (lambda _
> 
> I think the indendation is wrong here.

I think so too.

Kind regards,

T G-R


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

Re: [PATCH 2/2] gnu: Add nyx.

[Ludovic Courtès]

Tobias Geerinckx-Rice <me@tobias.gr> skribis:

> On 30/01/17 07:13, ng0 wrote:
>> Tobias Geerinckx-Rice <me@tobias.gr> writes:
>>> This adds Nyx (no relation), a handy status monitor for Tor relays.
>> 
>> Cool!
>> So it seems you have evaded the problems with the custom setup
>> phase they have, which I ran into. Strange. But nice.
>> 
>> I think it's okay, take a look at this search and the reactions I
>> got about it.
>> https://lists.gnu.org/archive/cgi-bin/namazu.cgi?query=nyx&submit=Search&idxname=guix-devel
>
> Oy, that's... so recent I completely missed it? I'm still trudging
> through the post-exam backlog & didn't know you'd submitted this too!
>
>> For the git commit you could mention that this used to be called
>> "arm" and since then has been replaced by "nyx", see the comment
>> Ludovic gave.
>
> Even better. I'll add it to the description field as well.

Yeah if you can make sure to integrate any missing bits of ng0’s
original patch and to address what was previously raised during review,
I think you can go ahead and push.

Thanks!

Ludo’.

Re: [PATCH 2/2] gnu: Add nyx.

[Tobias Geerinckx-Rice]

[-- Attachment #1.1: Type: text/plain, Size: 3250 bytes --]

Ludo',

On 30/01/17 15:31, Ludovic Courtès wrote:
> Yeah if you can make sure to integrate any missing bits of ng0’s
> original patch and to address what was previously raised during review,
> I think you can go ahead and push.

Great. Thanks!

Are you referring to any specific missing bits, or raised issues? I
thought I'd addressed them all in my reply.

I have kept my ‘1.9-’ version base, to highlight that Nyx 2.0 is
supposedly its own thing; a complete re-write since Arm 1.4.5.

Kind regards,

T G-R

---

The current package:

(define-public nyx
  ;; The last ‘arm’ relase was 5 years ago.  Meanwhile, python3 support
  ;; has been added and the software was renamed to ‘nyx’.
  (let ((commit "fea209127484d9b304b908a4711c9528b1d065bc")
        (revision "1"))                 ; Guix package revision
    (package
      (name "nyx")
      (version (string-append "1.9-"
                              revision "." (string-take commit 7)))
      (source
       (origin
         (method git-fetch)
         (file-name (string-append name "-" version "-checkout"))
         (uri (git-reference
               (url "https://git.torproject.org/nyx.git")
               (commit commit)))
         (sha256
          (base32
           "1g0l4988076xg5gs0x0nxzlg58rfx5g5agmklvyh4yp03vxncdb9"))))
      (build-system python-build-system)
      (native-inputs
       `(("python-mock" ,python-mock)
         ("python-pep8" ,python-pep8)
         ("python-pyflakes" ,python-pyflakes)))
      (inputs
       `(("python-stem" ,python-stem)))
      (arguments
       `(#:configure-flags
         (list (string-append "--man-page="
                              (assoc-ref %outputs "out")
                              "/share/man/man1/nyx.1")
               (string-append "--sample-path="
                              (assoc-ref %outputs "out")
                              "/share/doc/nyx/nyxrc.sample"))
         #:use-setuptools? #f           ; setup.py still uses distutils
         #:phases
         (modify-phases %standard-phases
           (replace 'check
             (lambda _
               (zero? (system* "./run_tests.py" "--unit")))))))
      ;; There's no home page yet.  This should change before the 2.0
release.
      (home-page "https://gitweb.torproject.org/nyx.git")
      (synopsis "Tor relay status monitor")
      (description "Nyx (formerly Anonymizing Relay Monitor or \"arm\")
monitors the performance of relays participating in the
@uref{https://www.torproject.org/, Tor anonymity network}.  It displays this
information visually and in real time, using a curses-based terminal
interface.
This makes Nyx well-suited for remote shell connections and servers
without a
graphical display.  It's like @command{top} for Tor, providing detailed
statistics and status reports on:

@enumerate
@item connections (with IP address, hostname, fingerprint, and consensus
data),
@item bandwidth, processor, and memory usage,
@item the relay's current configuration,
@item logged events,
@item and much more.
@end enumerate

Potential client and exit connections are scrubbed of sensitive
information.")
      (license license:gpl3))))


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

Re: [PATCH 2/2] gnu: Add nyx.

[ng0]

Tobias Geerinckx-Rice <me@tobias.gr> writes:

> Ludo',
>
> On 30/01/17 15:31, Ludovic Courtès wrote:
>> Yeah if you can make sure to integrate any missing bits of ng0’s
>> original patch and to address what was previously raised during review,
>> I think you can go ahead and push.
>
> Great. Thanks!
>
> Are you referring to any specific missing bits, or raised issues? I
> thought I'd addressed them all in my reply.
>
> I have kept my ‘1.9-’ version base, to highlight that Nyx 2.0 is
> supposedly its own thing; a complete re-write since Arm 1.4.5.

I think 1.9 is okay, we can verify if 2.0 works once it's out or
tagged, or whatever. I just packaged the HEAD (so 2.0) as I had
no clue about their versions.

> Kind regards,
>
> T G-R
>
> ---
>
> The current package:
>
> (define-public nyx
>   ;; The last ‘arm’ relase was 5 years ago.  Meanwhile, python3 support
>   ;; has been added and the software was renamed to ‘nyx’.
>   (let ((commit "fea209127484d9b304b908a4711c9528b1d065bc")
>         (revision "1"))                 ; Guix package revision
>     (package
>       (name "nyx")
>       (version (string-append "1.9-"
>                               revision "." (string-take commit 7)))
>       (source
>        (origin
>          (method git-fetch)
>          (file-name (string-append name "-" version "-checkout"))
>          (uri (git-reference
>                (url "https://git.torproject.org/nyx.git")
>                (commit commit)))
>          (sha256
>           (base32
>            "1g0l4988076xg5gs0x0nxzlg58rfx5g5agmklvyh4yp03vxncdb9"))))
>       (build-system python-build-system)
>       (native-inputs
>        `(("python-mock" ,python-mock)
>          ("python-pep8" ,python-pep8)
>          ("python-pyflakes" ,python-pyflakes)))
>       (inputs
>        `(("python-stem" ,python-stem)))
>       (arguments
>        `(#:configure-flags
>          (list (string-append "--man-page="
>                               (assoc-ref %outputs "out")
>                               "/share/man/man1/nyx.1")
>                (string-append "--sample-path="
>                               (assoc-ref %outputs "out")
>                               "/share/doc/nyx/nyxrc.sample"))
>          #:use-setuptools? #f           ; setup.py still uses distutils
>          #:phases
>          (modify-phases %standard-phases
>            (replace 'check
>              (lambda _
>                (zero? (system* "./run_tests.py" "--unit")))))))
>       ;; There's no home page yet.  This should change before the 2.0
> release.
>       (home-page "https://gitweb.torproject.org/nyx.git")
>       (synopsis "Tor relay status monitor")
>       (description "Nyx (formerly Anonymizing Relay Monitor or \"arm\")
> monitors the performance of relays participating in the
> @uref{https://www.torproject.org/, Tor anonymity network}.  It displays this
> information visually and in real time, using a curses-based terminal
> interface.
> This makes Nyx well-suited for remote shell connections and servers
> without a
> graphical display.  It's like @command{top} for Tor, providing detailed
> statistics and status reports on:
>
> @enumerate
> @item connections (with IP address, hostname, fingerprint, and consensus
> data),
> @item bandwidth, processor, and memory usage,
> @item the relay's current configuration,
> @item logged events,
> @item and much more.
> @end enumerate
>
> Potential client and exit connections are scrubbed of sensitive
> information.")
>       (license license:gpl3))))
>

-- 
ng0 -- https://www.inventati.org/patternsinthechaos/

Re: [PATCH 2/2] gnu: Add nyx.

[Tobias Geerinckx-Rice]

[-- Attachment #1.1: Type: text/plain, Size: 587 bytes --]

ng0,

Apologies for dragging out the thread, but to avoid any possible confusion:

On 30/01/17 20:16, ng0 wrote:
> I think 1.9 is okay, we can verify if 2.0 works once it's out or 
> tagged, or whatever. I just packaged the HEAD (so 2.0) as I had no 
> clue about their versions.

This is HEAD (2.0) as well.

My "1.9" is fictional, since unless I'm mistaken, using
"2.0-1.<commit>" now would inhibit automatic updates to to "2.0" later.

On 30/01/17 16:07, I wrote:
> The current package:

I'll push this version $soonish. Thanks everyone!

Kind regards,

T G-R


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

Re: [PATCH 1/2] gnu: tor: Use ‘license:’ prefix instead of #:select.

[Ludovic Courtès]

Tobias Geerinckx-Rice <me@tobias.gr> skribis:

> * gnu/packages/tor.scm (tor, torsocks, privoxy, onionshare)[license]:
> Add prefix.

Sure!