From mboxrd@z Thu Jan 1 00:00:00 1970 From: lemonnierk@ulrar.net Subject: Re: [PATCH] gnu: Add zsh Date: Mon, 8 Sep 2014 19:15:47 +0200 Message-ID: <20140908171547.GA31169@luwin.ulrar.net> References: <20140907181509.GC3546@luwin.ulrar.net> <87r3zmgw3m.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="vtzGhvizbBRQ85DL" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR2Xn-0004ds-5A for guix-devel@gnu.org; Mon, 08 Sep 2014 13:16:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XR2Xj-0006LM-4t for guix-devel@gnu.org; Mon, 08 Sep 2014 13:15:59 -0400 Content-Disposition: inline In-Reply-To: <87r3zmgw3m.fsf@gnu.org> 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-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Ludovic =?iso-8859-1?Q?Court=E8s?= Cc: guix-devel@gnu.org --vtzGhvizbBRQ85DL Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Thanks a lot for the feedback. Here is the new patch : =46rom 7352f5876a2c3942ebab92e30f659a62cd7bca7f Mon Sep 17 00:00:00 2001 =46rom: Kevin Lemonnier Date: Mon, 8 Sep 2014 21:06:31 +0200 Subject: [PATCH] gnu: Add zsh * gnu/packages/zsh.scm: New file * gnu-system.am (GNU_SYSTEM_MODULES): Add it --- gnu-system.am | 1 + gnu/packages/zsh.scm | 70 ++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 71 insertions(+) create mode 100644 gnu/packages/zsh.scm diff --git a/gnu-system.am b/gnu-system.am index b3d6123..86b18b5 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -256,6 +256,7 @@ GNU_SYSTEM_MODULES =3D \ gnu/packages/yasm.scm \ gnu/packages/zile.scm \ gnu/packages/zip.scm \ + gnu/packages/zsh.scm \ \ gnu/services.scm \ gnu/services/avahi.scm \ diff --git a/gnu/packages/zsh.scm b/gnu/packages/zsh.scm new file mode 100644 index 0000000..77e7ccf --- /dev/null +++ b/gnu/packages/zsh.scm @@ -0,0 +1,70 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2014 Kevin Lemonnier +;;; +;;; 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 . + +(define-module (gnu packages zsh) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages perl) + #:use-module (gnu packages pcre) + #:use-module (gnu packages autotools) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (guix licenses)) + +(define-public zsh + (package + (name "zsh") + (version "5.0.6") + (source (origin + (method url-fetch) + (uri (string-append "http://www.zsh.org/pub/zsh-" version + ".tar.gz")) + (sha256 + (base32 "0f9y2lkv6xs5nxgj7ld7sbncy454sgamz21fm4109mxqlqa32fp= h")))) + (build-system gnu-build-system) + (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre") + #:phases (alist-cons-before + 'configure 'fix-sh + (lambda _ + (substitute* + '("configure" + "configure.ac" + "Src/exec.c" + "Src/mkmakemod.sh" + "Config/installfns.sh" + "Config/defs.mk.in" + "Test/E01options.ztst" + "Test/A05execution.ztst" + "Test/A01grammar.ztst" + "Test/B02typeset.ztst" + "Completion/Unix/Command/_init_d" + "Util/preconfig") + (("/bin/sh") (which "sh")))) + %standard-phases))) + (native-inputs `(("autoconf", autoconf))) + (inputs `(("ncurses", ncurses) + ("pcre", pcre) + ("perl", perl))) + (synopsis "Powerful shell for interactive use and scripting") + (description "The Z shell (zsh) is a Unix shell that can be used +as an interactive login shell and as a powerful command interpreter +for shell scripting. Zsh can be thought of as an extended Bourne shell +with a large number of improvements, including some features of bash, +ksh, and tcsh.") + (home-page "http://www.zsh.org/") + (license gpl2+))) -- 1.8.4 On Mon, Sep 08, 2014 at 02:01:01PM +0200, Ludovic Court=C3=A8s wrote: > Hello, >=20 > lemonnierk@ulrar.net skribis: >=20 > > This is my first package, so I'd be interested to know if there is thin= gs that could be done better. > > For the license, most of the files uses their own license but a few are= under GPL, so I put that. Is that right, or should I > > put (license (x11-style "file://LICENCE")) as suggested on irc anyway ? >=20 > It seems to me that the text in LICENSE is a slight variant on the > MIT/X11 license. Thus, =E2=80=98x11-style=E2=80=99 would be appropriate. >=20 > However, LICENSE also reads this: >=20 > However, note that certain shell functions are licensed under versions > of the GNU General Public Licence. Anyone distributing the shell as a > binary including those files needs to take account of this. Search > shell functions for "Copyright" for specific copyright information. > None of the core functions are affected by this, so those files may > simply be omitted. >=20 > That effectively makes the combined work GPL, so this is what we should > put in the =E2=80=98license=E2=80=99 field (with a comment explaining thi= s.) >=20 > In practice, the only file under GPL is > =E2=80=98Completion/Unix/Command/_darcs=E2=80=99. It=E2=80=99s =E2=80=98= gplv2+=E2=80=99, to be precise. >=20 >=20 > The patch looks good to me, so I=E2=80=99ll just point out minor stylistic > things to change before we commit (the =E2=80=98HACKING=E2=80=99 file has= more details > on all this.) >=20 > > From 5e9276e131e744cdf5c93ad1713236e70f80797e Mon Sep 17 00:00:00 2001 > > From: Kevin Lemonnier > > Date: Sun, 7 Sep 2014 19:56:06 +0200 > > Subject: [PATCH 2/2] gnu: Add zsh > ^ > Extra space here ------=E2=80=99 >=20 > > * gnu/packages/zsh.scm: New variables. > ^ > Same here. Should be =E2=80=9CNew file=E2=80=9D. >=20 > Also make sure to add the file to gnu-system.am (see 52bd0810 as an > example.) >=20 > > +;;; Copyright =C2=A9 2012, 2013, 2014 Kevin Lemonnier >=20 > Just =E2=80=9C2014=E2=80=9D. >=20 > > + (arguments `(#:configure-flags '("--with-tcsetpgrp", "--enable-pcr= e") >=20 > Extraneous comma here. >=20 > > + (synopsis "Zsh is a shell designed for interactive use, although i= t is also a powerful scripting language") >=20 > It should be smaller, and not a sentence. For instance: >=20 > Powerful shell for interactive use and scripting >=20 > > + (description "The Z shell (zsh) is a Unix shell that can be used a= s an interactive login shell and as a powerful command interpreter for shel= l scripting. Zsh can be thought of as an extended Bourne shell with a large= number of improvements, including some features of bash, ksh, and tcsh.") >=20 > Please wrap to 72 columns. >=20 > > + (license gpl3))) >=20 > =E2=80=98gpl2+=E2=80=99, with the comment as discussed above. >=20 > Could you post an updated patch? >=20 > Thanks in advance, and welcome on board! :-) >=20 > Ludo=E2=80=99. --=20 Kevin Lemonnier PGP Fingerprint : C123 47CA 9E64 FCF0 3907 --vtzGhvizbBRQ85DL Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBAgAGBQJUDeRDAAoJEEfKnmT88DkHeikP/R8jEoaBmEwdm1iRUMsfaoJp 1oafy5VgqopiBMQ0emKymIZK3txlC9p0E0qSrPEFrSJ693LM81kCfgqB8wNoAqN/ MqLb2bLBdTNl3hirMyAlcg0UfdaU5Dh/nHMR/oNes9zSMz8ToKDOwlvTZwXzTJhf honeW8eq0bUZSrx+A7FtJ+mEb0XA3GoxkoCOvjW5+BBDhK9r84O3omhUxau3OITc y3SFb5aCT9m8DjmQw3n5cW+dVpjYU5kH2eX2EytFZ8xDSRpjKQVbopzNY6oMYG1P 8G9I1L0/R171PrdXuS93Ln4Mb++RJ3rYumB1IAfvfjIxurbaFethvzTg9pGFoDsg WqptcH6uY8fqkjpHjAZ+yV/9kSeDPlQwyNdk78mXH+BEEaJumRuQ4D30MbnKMG8j tF8uXt6Ki+bknpu7RdTMopu5ljTWjmBYbAyWFZov2haBqtXX1q4QxE2Cozlhz5gT STGyQYnRSXJsmWlM7dajhoIg6QFIY6AoLnKxosm41f9VoN9Gf8DflGjXDwBNKGFw 4mFZ/qYudcdQKWRLvtIIfJEw+I04ICeaNTAiU2R0JiLpqlbUiJ3Asnc53HHF0UGK Q9G43OFzAEPFAz58sTZrkuYgUxvrfOkDLlQlHDTUtkZQMMw7YgsJ0Z9L+/27oFAV 8tOhPVMGM5wWJrzCTcmg =wHhm -----END PGP SIGNATURE----- --vtzGhvizbBRQ85DL--