From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8vGl-0001Bk-RM for guix-patches@gnu.org; Thu, 11 May 2017 17:05:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8vGi-0005M1-4X for guix-patches@gnu.org; Thu, 11 May 2017 17:05:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:36511) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d8vGi-0005Lu-04 for guix-patches@gnu.org; Thu, 11 May 2017 17:05:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d8vGg-0006yr-5s for guix-patches@gnu.org; Thu, 11 May 2017 17:05:03 -0400 Subject: bug#26890: [PATCH] gnu: Add agrep. Resent-Message-ID: From: Kei Kebreau References: <20170511193045.8882-1-rekado@elephly.net> Date: Thu, 11 May 2017 17:04:08 -0400 In-Reply-To: <20170511193045.8882-1-rekado@elephly.net> (Ricardo Wurmus's message of "Thu, 11 May 2017 21:30:45 +0200") Message-ID: <87efvvhzqv.fsf@openmailbox.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ricardo Wurmus Cc: 26890@debbugs.gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ricardo Wurmus writes: > * gnu/packages/base.scm (agrep): New variable. > --- > gnu/packages/base.scm | 33 ++++++++++++++++++++++++++++++++- > 1 file changed, 32 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm > index 59a9acd67..a07638c38 100644 > --- a/gnu/packages/base.scm > +++ b/gnu/packages/base.scm > @@ -8,6 +8,7 @@ > ;;; Copyright =C2=A9 2016 Efraim Flashner > ;;; Copyright =C2=A9 2016 Jan Nieuwenhuizen > ;;; Copyright =C2=A9 2017 Marius Bakke > +;;; Copyright =C2=A9 2017 Ricardo Wurmus > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -26,7 +27,7 @@ >=20=20 > (define-module (gnu packages base) > #:use-module ((guix licenses) > - #:select (gpl3+ lgpl2.0+ lgpl3+ public-domain)) > + #:select (gpl2+ gpl3+ lgpl2.0+ lgpl3+ public-domain)) > #:use-module (gnu packages) > #:use-module (gnu packages acl) > #:use-module (gnu packages bash) > @@ -116,6 +117,36 @@ including, for example, recursive directory searchin= g.") > (license gpl3+) > (home-page "https://www.gnu.org/software/grep/"))) >=20=20 > +(define-public agrep > + (package > + (name "agrep") > + (version "3.41") > + (source (origin > + (method url-fetch) > + (uri (string-append "https://www.tgries.de/agrep/agrep-" > + version ".tgz")) > + (sha256 > + (base32 > + "0ki3gbvc7lh8alks9zm48f216l2gp8r6vssmr5yccpvjz7xfl205"))= )) > + (build-system gnu-build-system) > + (arguments > + `(#:tests? #f ; no "check" target > + #:phases > + (modify-phases %standard-phases > + (delete 'configure) > + (replace 'install > + (lambda* (#:key outputs #:allow-other-keys) > + (let ((bin (string-append (assoc-ref outputs "out") "/bin")= )) > + (mkdir-p bin) > + (install-file "agrep" bin) > + #t)))))) > + (home-page "https://www.tgries.de/agrep/") > + (synopsis "Approximate grep for fast fuzzy string searching") > + (description "Agrep is a tool for fast searching of files for a stri= ng or > +regular expression, with approximate matching capabilities and user-defi= nable > +records.") > + (license gpl2+))) > + > (define-public sed > (package > (name "sed") Quote from copying.agrep in the source directory: 4. Redistribution for profit requires the express, written permission of the authors. There is a similar clause on the website. Does the GPL or this clause take precedence? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlkU0cgACgkQ5qXuPBlG eg2TIQ//W9oopWEoAJnSzFw5qswhD4cwTdkYpS6scUagaKStRbt5Sc7i2B6aZULv dRiD3TWx9kl0PtxUM/whlTlSKFAEplyDKZx+k+4w86Bt1DzH8f+z4IP/xy6H7nPq bLfv9eVxpSOsRrV4WrLSyfiPtU8C0K5MYt6/inJABNvn5Vo5HQCsqpdJQ8J563sn piHfIFE7ZAyMY6H72zeXbZ97LiEy42wfX9VxFnxXlQ6PQtgBT0rQMb/NTQBeWJjT 97F59P3ZeM0MY6UbOcdYqg+lXBfA/wnX+3UxVkbV3DzERCiPeY4lmPEZsWh7IF3E MufMWckc/MC6vdiKZexqaCJe0I4nRIXvAEGmJeNgRLNDEps7q+pMzSEEenkpkuzO zE+D/7B5Ry6i+DBHZs2gnY6gcNkEchTA1oMzKIMdYOOVIYFTwi8B7bpJ8bW0VyPj ZzTLwOM+pVaBbeVuqVJ+sEx3Yv6e4XpGIfphBRodxyY5iqUx+xE/T9bgf3ZKqNQs aEXfT7zUOkVy7QX/7/r5DdLq8j0jr7PgB4h+Le85Q++AXAv3uhTn/laAnsoAJSLv LfKR7S7bg8vrAgBjd/mh8wX1b92dzucy2A4QUz9oX0J/Y3RSy6+oBhSJXKo/jiYG RaCAmJ0sjN2qnOWRVsEYvKRHnifcA1QXBr7Wrj5mxM/4BMscYK4= =MHpw -----END PGP SIGNATURE----- --=-=-=--