From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Bavier Subject: Re: [PATCH] gnu: perl-net-psyc Date: Wed, 15 Jun 2016 16:53:34 -0500 Message-ID: <20160615165334.636551b4@openmailbox.org> References: <20160615163930.GA6612@khazad-dum> <20160615164148.GA6667@khazad-dum> 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]:44197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDIky-0008Ob-M2 for guix-devel@gnu.org; Wed, 15 Jun 2016 17:53:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDIku-00013S-Ec for guix-devel@gnu.org; Wed, 15 Jun 2016 17:53:51 -0400 Received: from mail.openmailbox.org ([62.4.1.34]:40196) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDIku-00013I-0U for guix-devel@gnu.org; Wed, 15 Jun 2016 17:53:48 -0400 In-Reply-To: <20160615164148.GA6667@khazad-dum> 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 On Wed, 15 Jun 2016 16:41:48 +0000 ng0 wrote: > Optional dependencies incoming in the future, Perl Curses being the > first one. > They are optional and need to explanation as the binaries themselves > complaint (and give you motivation to package them ;) ) >=20 >=20 > On 2016-06-15(04:39:30PM+0000), ng0 wrote: > > From 10eeb85733c67c4fdd5cd4df84457a565e45971e Mon Sep 17 00:00:00 2001 > > From: ng0 > > Date: Wed, 15 Jun 2016 16:30:30 +0000 > > Subject: [PATCH] gnu: Add perl-net-psyc. > > > > * gnu/packages/perl.scm (perl-net-psyc): New Variable. > > --- > > gnu/packages/perl.scm | 71 +++++++++++++++++++++++++++++++++++++++++++= ++++++++ > > 1 file changed, 71 insertions(+) > > > > diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm > > index e7e7967..8772d0a 100644 > > --- a/gnu/packages/perl.scm > > +++ b/gnu/packages/perl.scm > > @@ -7,6 +7,7 @@ > > ;;; Copyright =C2=A9 2016 Mark H Weaver > > ;;; Copyright =C2=A9 2016 Jochem Raat > > ;;; Copyright =C2=A9 2016 Efraim Flashner > > +;;; Coypright =C2=A9 2016 ng0 > > ;;; > > ;;; This file is part of GNU Guix. > > ;;; > > @@ -28,6 +29,7 @@ > > #:use-module (gnu packages) > > #:use-module (guix packages) > > #:use-module (guix download) > > + #:use-module (guix git-download) > > #:use-module (guix build-system gnu) > > #:use-module (guix build-system perl)) > > > > @@ -3865,6 +3867,75 @@ cycle. Functions called in the package itself w= ill still be bound by their > > name, but they won't show up as methods on your class or instances.") > > (license (package-license perl)))) > > > > +;; highly optional dependencies: rxaudio (mp3 binary from 1996) > > +;; opt. perl: MP3::List (psycmp3), Curses (psycion), pwd.pl > > +;; (psyccmd), SGI::FAM module (psycfilemonitor); for full > > +;; functionality package all except MP3::List. > > +(define-public perl-net-psyc Is it not possible to use the zip at http://perlpsyc.psyc.eu/perlpsyc-1.0.zip ? If there are bug fixes in the git repo that we cannot do without, could you give a brief summary in a comment? > > + (let ((commit "4176f5236e73e99391c0877152d5596ab0a9b154")) > > + (package > > + (name "perl-net-psyc") > > + (version (string-append "1.0" "-" > > + (string-take commit 8))) > > + (source (origin > > + (method git-fetch) > > + (uri (git-reference > > + (url "git://git.psyced.org/git/perlpsyc") > > + (commit commit))) > > + (file-name (string-append name "-" version)) > > + (sha256 > > + (base32 > > + "19msvr1kriqa6n8cnk8z96xd5i0v5cy2y52jsj08vaj79b4m7sp= h")))) > > + (build-system perl-build-system) > > + (arguments > > + `(#:phases > > + (modify-phases %standard-phases > > + (delete 'configure) > > + (delete 'build) > > + (replace 'install Could you add a comment saying that the source distribution's INSTALL.txt says to roll-your-own installation? > > + (lambda* (#:key outputs #:allow-other-keys) > > + (let* ((out (assoc-ref outputs "out")) > > + (doc (string-append out "/share/doc/perl-net-psy= c")) > > + (libpsyc (string-append out "/lib/psyc/ion")) > > + (libperl (string-append out "/lib/perl5/site_per= l/" > > + ,(package-version perl))) > > + (bin (string-append out "/bin"))) > > + (copy-recursively "lib/perl5" libperl) > > + (copy-recursively "lib/psycion" libpsyc) > > + (copy-recursively "bin" bin) > > + (install-file "cgi/psycpager" (string-append doc "/cg= i")) > > + (copy-recursively "contrib" (string-append doc "/cont= rib")) I doesn't seem clear to me that the contents of "contrib" are covered under the same license as the rest of the package. > > + (copy-recursively "hooks" (string-append doc "/hooks"= )) > > + (copy-recursively "sdj" (string-append doc "/sdj")) > > + (install-file "README.txt" doc) > > + (install-file "TODO.txt" doc) > > + #t))) > > + (add-after 'install 'wrap-programs > > + (lambda* (#:key outputs #:allow-other-keys) > > + ;; Make sure all executables in "bin" find the Perl mod= ules > > + ;; provided by this package at runtime. > > + (let* ((out (assoc-ref outputs "out")) > > + (bin (string-append out "/bin/")) > > + (path (string-append out "/lib/perl5/site_perl")= )) > > + (for-each (lambda (file) > > + (wrap-program file > > + `("PERL5LIB" ":" prefix (,path)))) > > + (find-files bin "\\.*$")) > > + ;; XXX: hooks/dpa2psyc,examples/{recvtest,sendtest}, > > + ;; cgi/psycpager,contrib/{makenoise,keefchat > > + ;; contrib/MovableTypeBlog/plugins/psyc.pl Should this XXX be removed? > > + #t)))))) > > + (description > > + "Net::PSYC with support for TCP, UDP, Event.pm, IO::Select and > > +Gtk2 event loops. This package includes 12 applications and Perhaps "@code{Net::PSYC} is a Perl implementation of the PSYC protocol with support for ..."? > > +additional scripts: psycion, a @uref{http://about.psyc.eu, PSYC} chat = client, > > +remotor, a control console for @uref{https://torproject.org, tor} rout= er, and many more. > > +Further information is included in the package source and on the websi= te.") > > + (synopsis "Perl implementation of PSYC protocol") > > + (home-page "http://perlpsyc.psyc.eu/") > > + ;;dual licensed: gpl2+ Artistic > > + (license (list gpl2+ (package-license perl)))))) LICENSE.txt says "GPL-2", and I cannot see an "or later" in the source files themselves. In fact, the few files I see that mention a license have just the "under the same terms as perl itself" verbiage. So maybe leave out the "gpl2+"? Could you send an updated patch? Thanks, `~Eric