diff mbox

[1/4] gnu: Add perl-net-psyc.

Message ID 20160929103810.10273-1-ngillmann@runbox.com
State New
Headers show

Commit Message

ng0 Sept. 29, 2016, 10:38 a.m. UTC
* gnu/packages/psyc.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
---
 gnu/local.mk          |   1 +
 gnu/packages/psyc.scm | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 gnu/packages/psyc.scm

Comments

Leo Famulari Oct. 2, 2016, 1:46 a.m. UTC | #1
On Thu, Sep 29, 2016 at 10:38:07AM +0000, ng0 wrote:
> * gnu/packages/psyc.scm: New file.
> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.

> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "http://perl.psyc.eu/"
> +                           "perlpsyc-" version ".zip"))
> +       (file-name (string-append name "-" version ".zip"))
> +       (sha256
> +        (base32
> +         "1lw6807qrbmvzbrjn1rna1dhir2k70xpcjvyjn45y35hav333a42"))

This is the wrong hash.
http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02076.html
ng0 Oct. 2, 2016, 10:35 a.m. UTC | #2
Leo Famulari <leo@famulari.name> writes:

> On Thu, Sep 29, 2016 at 10:38:07AM +0000, ng0 wrote:
>> * gnu/packages/psyc.scm: New file.
>> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
>
>> +    (source
>> +     (origin
>> +       (method url-fetch)
>> +       (uri (string-append "http://perl.psyc.eu/"
>> +                           "perlpsyc-" version ".zip"))
>> +       (file-name (string-append name "-" version ".zip"))
>> +       (sha256
>> +        (base32
>> +         "1lw6807qrbmvzbrjn1rna1dhir2k70xpcjvyjn45y35hav333a42"))
>
> This is the wrong hash.
> http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02076.html

No, it's not. Our server recently had to be moved and I don't know what
happened during that time, but to make sure I checked the download
before I commited the new series and repeated that check just now:

ng0@shadowwalker ~/re-src$ wget http://perlpsyc.psyc.eu/perlpsyc-1.1.zip
--2016-10-02 10:34:12--  http://perlpsyc.psyc.eu/perlpsyc-1.1.zip
Resolving perlpsyc.psyc.eu (perlpsyc.psyc.eu)... 188.40.42.221
Connecting to perlpsyc.psyc.eu (perlpsyc.psyc.eu)|188.40.42.221|:80... connected.
HTTP request sent, awaiting response... 200 OK
Length: 444423 (434K) [application/zip]
Saving to: ‘perlpsyc-1.1.zip’

perlpsyc-1.1.zip           100%[=====================================>] 434.01K   927KB/s    in 0.5s    

2016-10-02 10:34:12 (927 KB/s) - ‘perlpsyc-1.1.zip’ saved [444423/444423]

ng0@shadowwalker ~/re-src$ guix hash perlpsyc-1.1.zip 
1lw6807qrbmvzbrjn1rna1dhir2k70xpcjvyjn45y35hav333a42
ng0@shadowwalker ~/re-src$ 

--
Leo Famulari Oct. 4, 2016, 2:24 a.m. UTC | #3
On Sun, Oct 02, 2016 at 10:35:43AM +0000, ng0 wrote:
> Leo Famulari <leo@famulari.name> writes:
> 
> > On Thu, Sep 29, 2016 at 10:38:07AM +0000, ng0 wrote:
> >> * gnu/packages/psyc.scm: New file.
> >> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
> >
> >> +    (source
> >> +     (origin
> >> +       (method url-fetch)
> >> +       (uri (string-append "http://perl.psyc.eu/"
> >> +                           "perlpsyc-" version ".zip"))
> >> +       (file-name (string-append name "-" version ".zip"))
> >> +       (sha256
> >> +        (base32
> >> +         "1lw6807qrbmvzbrjn1rna1dhir2k70xpcjvyjn45y35hav333a42"))
> >
> > This is the wrong hash.
> > http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02076.html
> 
> No, it's not. Our server recently had to be moved and I don't know what
> happened during that time, but to make sure I checked the download
> before I commited the new series and repeated that check just now:
> 
> ng0@shadowwalker ~/re-src$ wget http://perlpsyc.psyc.eu/perlpsyc-1.1.zip
> --2016-10-02 10:34:12--  http://perlpsyc.psyc.eu/perlpsyc-1.1.zip
> Resolving perlpsyc.psyc.eu (perlpsyc.psyc.eu)... 188.40.42.221
> Connecting to perlpsyc.psyc.eu (perlpsyc.psyc.eu)|188.40.42.221|:80... connected.
> HTTP request sent, awaiting response... 200 OK
> Length: 444423 (434K) [application/zip]
> Saving to: ‘perlpsyc-1.1.zip’
> 
> perlpsyc-1.1.zip           100%[=====================================>] 434.01K   927KB/s    in 0.5s    
> 
> 2016-10-02 10:34:12 (927 KB/s) - ‘perlpsyc-1.1.zip’ saved [444423/444423]
> 
> ng0@shadowwalker ~/re-src$ guix hash perlpsyc-1.1.zip 
> 1lw6807qrbmvzbrjn1rna1dhir2k70xpcjvyjn45y35hav333a42

The URL you used with wget is different from the URL used in the patch.

The download from perlpsyc.psyc.eu is a Git repo whereas the download
from perl.psyc.eu is a plain directory.

The patch uses the URL for the plain directory while the hash is of the
Git repo.

Can you clarify which download the package should use?
ng0 Oct. 4, 2016, 8:23 a.m. UTC | #4
Leo Famulari <leo@famulari.name> writes:

> On Sun, Oct 02, 2016 at 10:35:43AM +0000, ng0 wrote:
>> Leo Famulari <leo@famulari.name> writes:
>> 
>> > On Thu, Sep 29, 2016 at 10:38:07AM +0000, ng0 wrote:
>> >> * gnu/packages/psyc.scm: New file.
>> >> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
>> >
>> >> +    (source
>> >> +     (origin
>> >> +       (method url-fetch)
>> >> +       (uri (string-append "http://perl.psyc.eu/"
>> >> +                           "perlpsyc-" version ".zip"))
>> >> +       (file-name (string-append name "-" version ".zip"))
>> >> +       (sha256
>> >> +        (base32
>> >> +         "1lw6807qrbmvzbrjn1rna1dhir2k70xpcjvyjn45y35hav333a42"))
>> >
>> > This is the wrong hash.
>> > http://lists.gnu.org/archive/html/guix-devel/2016-09/msg02076.html
>> 
>> No, it's not. Our server recently had to be moved and I don't know what
>> happened during that time, but to make sure I checked the download
>> before I commited the new series and repeated that check just now:
>> 
>> ng0@shadowwalker ~/re-src$ wget http://perlpsyc.psyc.eu/perlpsyc-1.1.zip
>> --2016-10-02 10:34:12--  http://perlpsyc.psyc.eu/perlpsyc-1.1.zip
>> Resolving perlpsyc.psyc.eu (perlpsyc.psyc.eu)... 188.40.42.221
>> Connecting to perlpsyc.psyc.eu (perlpsyc.psyc.eu)|188.40.42.221|:80... connected.
>> HTTP request sent, awaiting response... 200 OK
>> Length: 444423 (434K) [application/zip]
>> Saving to: ‘perlpsyc-1.1.zip’
>> 
>> perlpsyc-1.1.zip           100%[=====================================>] 434.01K   927KB/s    in 0.5s    
>> 
>> 2016-10-02 10:34:12 (927 KB/s) - ‘perlpsyc-1.1.zip’ saved [444423/444423]
>> 
>> ng0@shadowwalker ~/re-src$ guix hash perlpsyc-1.1.zip 
>> 1lw6807qrbmvzbrjn1rna1dhir2k70xpcjvyjn45y35hav333a42
>
> The URL you used with wget is different from the URL used in the patch.
>
> The download from perlpsyc.psyc.eu is a Git repo whereas the download
> from perl.psyc.eu is a plain directory.
>
> The patch uses the URL for the plain directory while the hash is of the
> Git repo.
>
> Can you clarify which download the package should use?
>

Okay so

+     (origin
+       (method url-fetch)
+       (uri (string-append "http://perl.psyc.eu/"
+                           "perlpsyc-" version ".zip"))

is wrong. it hsould've been

+     (origin
+       (method url-fetch)
+       (uri (string-append "http://perlpsyc.eu/"
+                           "perlpsyc-" version ".zip"))

The new patch series which will be coming as the next messages fixes
this. This is the only location of the perlpsyc downloads, my mistake,
Sorry.
The archive is indeed just a zipped git repository, that's correct.
It did not affect building and installing for me. I'll address it in one
of our TODO lists if it is a problem for you.
--
ng0 Oct. 4, 2016, 8:34 a.m. UTC | #5
Please either ignore "4/4: gnu: Add psyced" or review while keeping in mind that this is still subject to changes as I am writing the psyced-service.

Thanks for reviewing
Ricardo Wurmus Oct. 30, 2016, 5:54 a.m. UTC | #6
ng0 <ngillmann@runbox.com> writes:

> * gnu/packages/psyc.scm: New file.
> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
> ---
>  gnu/local.mk          |   1 +
>  gnu/packages/psyc.scm | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 106 insertions(+)
>  create mode 100644 gnu/packages/psyc.scm
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index b864ea9..d49d458 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -296,6 +296,7 @@ GNU_SYSTEM_MODULES =				\
>    %D%/packages/pumpio.scm			\
>    %D%/packages/pretty-print.scm			\
>    %D%/packages/protobuf.scm			\
> +  %D%/packages/psyc.scm                         \
>    %D%/packages/pv.scm				\
>    %D%/packages/python.scm			\
>    %D%/packages/qemu.scm				\
> diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm
> new file mode 100644
> index 0000000..4d53dfd
> --- /dev/null
> +++ b/gnu/packages/psyc.scm

Could you add this to “messaging” instead?


> @@ -0,0 +1,105 @@
> +;;; GNU Guix --- Functional package management for GNU
> +;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
> +;;;
> +;;; This file is part of GNU Guix.
> +;;;
> +;;; GNU Guix is free software; you can redistribute it and/or modify it
> +;;; under the terms of the GNU General Public License as published by
> +;;; the Free Software Foundation; either version 3 of the License, or (at
> +;;; your option) any later version.
> +;;;
> +;;; GNU Guix is distributed in the hope that it will be useful, but
> +;;; WITHOUT ANY WARRANTY; without even the implied warranty of
> +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +;;; GNU General Public License for more details.
> +;;;
> +;;; You should have received a copy of the GNU General Public License
> +;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
> +
> +(define-module (gnu packages psyc)
> +  #:use-module (guix download)
> +  #:use-module ((guix licenses) #:prefix license:)
> +  #:use-module (guix packages)
> +  #:use-module (guix build-system perl)
> +  #:use-module (gnu packages)
> +  #:use-module (gnu packages ncurses)
> +  #:use-module (gnu packages perl)
> +  #:use-module (gnu packages web))
> +
> +(define-public perl-net-psyc
> +  (package
> +    (name "perl-net-psyc")
> +    (version "1.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "http://perl.psyc.eu/"
> +                           "perlpsyc-" version ".zip"))
> +       (file-name (string-append name "-" version ".zip"))
> +       (sha256
> +        (base32
> +         "1lw6807qrbmvzbrjn1rna1dhir2k70xpcjvyjn45y35hav333a42"))
> +       ;; psycmp3 currently depends on MP3::List and rxaudio
> (shareware),

Let’s just call this “non-free”.

> +       ;; we can add it back when this is no longer the case.
> +       (snippet '(delete-file "contrib/psycmp3"))))
> +    (build-system perl-build-system)
> +    (inputs
> +     `(("perl-curses" ,perl-curses)
> +       ("perl-io-socket-ssl" ,perl-io-socket-ssl)))
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (delete 'configure) ; No configure script
> +         ;; There is a Makefile, but it does not install everything
> +         ;; (leaves out psycion) and says
> +         ;; "# Just to give you a rough idea". XXX: Fix it upstream.

Since you appear to be involved with the project surrounding psyced
could you send a fix upstream instead of building a custom install phase
here?

> +         (replace 'build
> +           (lambda _
> +             (zero? (system* "make" "manuals"))))

This might need a comment.  By default the “build” phase runs the
“Build” script if it exists or runs the default gnu-build-system’s build
phase.   If the only buildable thing really are the manuals (which would
be odd), then this should be a make-flag.

> +         (replace 'install
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (doc (string-append out "/share/doc/perl-net-psyc"))
> +                    (man1 (string-append out "/share/man/man1"))
> +                    (man3 (string-append out "/share/man/man3"))
> +                    (bin (string-append out "/bin"))
> +                    (libpsyc (string-append out "/lib/psyc/ion"))
> +                    (libperl (string-append out "/lib/perl5/site_perl/"
> +                                            ,(package-version perl))))
> +
> +               (copy-recursively "lib/perl5" libperl)
> +               (copy-recursively "lib/psycion" libpsyc)
> +               (copy-recursively "bin" bin)
> +               (install-file "cgi/psycpager" (string-append doc "/cgi"))
> +               (copy-recursively "contrib" (string-append doc "/contrib"))
> +               (copy-recursively "hooks" (string-append doc "/hooks"))
> +               (copy-recursively "sdj" (string-append doc "/sdj"))
> +               (install-file "README.txt" doc)
> +               (install-file "TODO.txt" doc)
> +               (copy-recursively "share/man/man1" man1)
> +               (copy-recursively "share/man/man3" man3)
> +               #t)))
> +         (add-after 'install 'wrap-programs
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             ;; Make sure all executables in "bin" find the Perl modules
> +             ;; provided by this package at runtime.
> +             (let* ((out  (assoc-ref outputs "out"))
> +                    (bin  (string-append out "/bin/"))
> +                    (path (getenv "PERL5LIB")))
> +               (for-each (lambda (file)
> +                           (wrap-program file
> +                             `("PERL5LIB" ":" prefix (,path))))
> +                         (find-files bin "\\.*$"))
> +               #t))))))
> +    (description
> +     "@code{Net::PSYC} with support for TCP, UDP, Event.pm, @code{IO::Select} and
> +Gtk2 event loops.  This package includes 12 applications and additional scripts:
> +psycion (a @uref{http://about.psyc.eu,PSYC} chat client), remotor (a control console
> +for @uref{https://torproject.org,tor} router) and many more.")

Please use full sentences.  Please also say what it’s used for.

> +    (synopsis "Perl implementation of PSYC protocol")
> +    (home-page "http://perlpsyc.pages.de")
> +    (license (list license:gpl2 (package-license perl)

What is GPLv2 only and what code does the Perl license apply to?

> +                   ;; contrib/irssi-psyc.pl:
> +                   license:public-domain
> +                   ;; bin/psycplay states AGPL with no version:
> +                   license:agpl3+))))

~~ Ricardo
diff mbox

Patch

diff --git a/gnu/local.mk b/gnu/local.mk
index b864ea9..d49d458 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -296,6 +296,7 @@  GNU_SYSTEM_MODULES =				\
   %D%/packages/pumpio.scm			\
   %D%/packages/pretty-print.scm			\
   %D%/packages/protobuf.scm			\
+  %D%/packages/psyc.scm                         \
   %D%/packages/pv.scm				\
   %D%/packages/python.scm			\
   %D%/packages/qemu.scm				\
diff --git a/gnu/packages/psyc.scm b/gnu/packages/psyc.scm
new file mode 100644
index 0000000..4d53dfd
--- /dev/null
+++ b/gnu/packages/psyc.scm
@@ -0,0 +1,105 @@ 
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages psyc)
+  #:use-module (guix download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix build-system perl)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages web))
+
+(define-public perl-net-psyc
+  (package
+    (name "perl-net-psyc")
+    (version "1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://perl.psyc.eu/"
+                           "perlpsyc-" version ".zip"))
+       (file-name (string-append name "-" version ".zip"))
+       (sha256
+        (base32
+         "1lw6807qrbmvzbrjn1rna1dhir2k70xpcjvyjn45y35hav333a42"))
+       ;; psycmp3 currently depends on MP3::List and rxaudio (shareware),
+       ;; we can add it back when this is no longer the case.
+       (snippet '(delete-file "contrib/psycmp3"))))
+    (build-system perl-build-system)
+    (inputs
+     `(("perl-curses" ,perl-curses)
+       ("perl-io-socket-ssl" ,perl-io-socket-ssl)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure) ; No configure script
+         ;; There is a Makefile, but it does not install everything
+         ;; (leaves out psycion) and says
+         ;; "# Just to give you a rough idea". XXX: Fix it upstream.
+         (replace 'build
+           (lambda _
+             (zero? (system* "make" "manuals"))))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (string-append out "/share/doc/perl-net-psyc"))
+                    (man1 (string-append out "/share/man/man1"))
+                    (man3 (string-append out "/share/man/man3"))
+                    (bin (string-append out "/bin"))
+                    (libpsyc (string-append out "/lib/psyc/ion"))
+                    (libperl (string-append out "/lib/perl5/site_perl/"
+                                            ,(package-version perl))))
+
+               (copy-recursively "lib/perl5" libperl)
+               (copy-recursively "lib/psycion" libpsyc)
+               (copy-recursively "bin" bin)
+               (install-file "cgi/psycpager" (string-append doc "/cgi"))
+               (copy-recursively "contrib" (string-append doc "/contrib"))
+               (copy-recursively "hooks" (string-append doc "/hooks"))
+               (copy-recursively "sdj" (string-append doc "/sdj"))
+               (install-file "README.txt" doc)
+               (install-file "TODO.txt" doc)
+               (copy-recursively "share/man/man1" man1)
+               (copy-recursively "share/man/man3" man3)
+               #t)))
+         (add-after 'install 'wrap-programs
+           (lambda* (#:key outputs #:allow-other-keys)
+             ;; Make sure all executables in "bin" find the Perl modules
+             ;; provided by this package at runtime.
+             (let* ((out  (assoc-ref outputs "out"))
+                    (bin  (string-append out "/bin/"))
+                    (path (getenv "PERL5LIB")))
+               (for-each (lambda (file)
+                           (wrap-program file
+                             `("PERL5LIB" ":" prefix (,path))))
+                         (find-files bin "\\.*$"))
+               #t))))))
+    (description
+     "@code{Net::PSYC} with support for TCP, UDP, Event.pm, @code{IO::Select} and
+Gtk2 event loops.  This package includes 12 applications and additional scripts:
+psycion (a @uref{http://about.psyc.eu,PSYC} chat client), remotor (a control console
+for @uref{https://torproject.org,tor} router) and many more.")
+    (synopsis "Perl implementation of PSYC protocol")
+    (home-page "http://perlpsyc.pages.de")
+    (license (list license:gpl2 (package-license perl)
+                   ;; contrib/irssi-psyc.pl:
+                   license:public-domain
+                   ;; bin/psycplay states AGPL with no version:
+                   license:agpl3+))))