From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: Re: [PATCH 1/4] gnu: Add perl-net-psyc. Date: Sun, 30 Oct 2016 06:54:57 +0100 Message-ID: <87fune9ya6.fsf@mdc-berlin.de> References: <20160929103810.10273-1-ngillmann@runbox.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34280) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c0j5K-0003cO-Ew for guix-devel@gnu.org; Sun, 30 Oct 2016 01:55:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c0j5H-0003rD-1l for guix-devel@gnu.org; Sun, 30 Oct 2016 01:55:10 -0400 Received: from pegasus.bbbm.mdc-berlin.de ([141.80.25.20]:52737) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c0j5G-0003pC-Kc for guix-devel@gnu.org; Sun, 30 Oct 2016 01:55:06 -0400 In-Reply-To: <20160929103810.10273-1-ngillmann@runbox.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: ng0 Cc: guix-devel@gnu.org ng0 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 =3D \ > %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 =E2=80=9Cmessaging=E2=80=9D instead? > @@ -0,0 +1,105 @@ > +;;; GNU Guix --- Functional package management for GNU > +;;; Copyright =C2=A9 2016 ng0 > +;;; > +;;; This file is part of GNU Guix. > +;;; > +;;; GNU Guix is free software; you can redistribute it and/or modify i= t > +;;; 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 . > + > +(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=E2=80=99s just call this =E2=80=9Cnon-free=E2=80=9D. > + ;; 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 =E2=80=9Cbuild=E2=80=9D phase = runs the =E2=80=9CBuild=E2=80=9D script if it exists or runs the default gnu-build= -system=E2=80=99s 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 "/contri= b")) > + (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 modul= es > + ;; 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 additiona= l scripts: > +psycion (a @uref{http://about.psyc.eu,PSYC} chat client), remotor (a c= ontrol console > +for @uref{https://torproject.org,tor} router) and many more.") Please use full sentences. Please also say what it=E2=80=99s 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