From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39339) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d8vQT-0003A5-Ri for guix-patches@gnu.org; Thu, 11 May 2017 17:15:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d8vQN-0003vU-T8 for guix-patches@gnu.org; Thu, 11 May 2017 17:15:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:36520) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d8vQN-0003vN-Oz for guix-patches@gnu.org; Thu, 11 May 2017 17:15:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d8vQM-0007DV-Eo for guix-patches@gnu.org; Thu, 11 May 2017 17:15:03 -0400 Subject: bug#26890: [PATCH] gnu: Add agrep. Resent-Message-ID: References: <20170511193045.8882-1-rekado@elephly.net> <87efvvhzqv.fsf@openmailbox.org> From: Ricardo Wurmus In-reply-to: <87efvvhzqv.fsf@openmailbox.org> Date: Thu, 11 May 2017 23:14:40 +0200 Message-ID: <87vap7rt8f.fsf@elephly.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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: Kei Kebreau Cc: 26890@debbugs.gnu.org Kei Kebreau writes: > 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 © 2016 Efraim Flashner >> ;;; Copyright © 2016 Jan Nieuwenhuizen >> ;;; Copyright © 2017 Marius Bakke >> +;;; Copyright © 2017 Ricardo Wurmus >> ;;; >> ;;; This file is part of GNU Guix. >> ;;; >> @@ -26,7 +27,7 @@ >> >> (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 searching.") >> (license gpl3+) >> (home-page "https://www.gnu.org/software/grep/"))) >> >> +(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 string or >> +regular expression, with approximate matching capabilities and user-definable >> +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? Hmm, this is confusing. The COPYRIGHT and README files in the git repository say that the license is ICS since Sept 18, 2014, but that’s not part of the tarball. :~/ ? I’m not so happy to put this in base, by the way. I just added it there because that’s where grep is. Any other ideas? -- Ricardo GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC https://elephly.net