bug#26890: [PATCH] gnu: Add agrep.

bug#26890: [PATCH] gnu: Add agrep.

[Ricardo Wurmus]

* 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 <efraim@flashner.co.il>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; 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")
-- 
2.12.2

bug#26890: [PATCH] gnu: Add agrep.

[Kei Kebreau]

[-- Attachment #1: Type: text/plain, Size: 2744 bytes --]

Ricardo Wurmus <rekado@elephly.net> 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 <efraim@flashner.co.il>
>  ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
>  ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
> +;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
>  ;;;
>  ;;; 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?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

bug#26890: [PATCH] gnu: Add agrep.

[Ricardo Wurmus]

Kei Kebreau <kei@openmailbox.org> writes:

> Ricardo Wurmus <rekado@elephly.net> 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 <efraim@flashner.co.il>
>>  ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
>>  ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
>> +;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
>>  ;;;
>>  ;;; 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

bug#26890: [PATCH] gnu: Add agrep.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

Ricardo Wurmus <rekado@elephly.net> writes:

> 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?

I'd use 'textutils.scm', but there is also 'code.scm' with similar
tools.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#26890: [PATCH] gnu: Add agrep.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 365 bytes --]

On Thu, May 11, 2017 at 05:04:08PM -0400, Kei Kebreau wrote:
> Quote from copying.agrep in the source directory:
>   4. Redistribution for profit requires the express, written permission
>      of the authors.

Unfortunately, this clause makes agrep not free software. Indeed, Debian
distributes it from their non-free repos:

https://packages.debian.org/sid/agrep

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#26890: [PATCH] gnu: Add agrep.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> On Thu, May 11, 2017 at 05:04:08PM -0400, Kei Kebreau wrote:
>> Quote from copying.agrep in the source directory:
>>   4. Redistribution for profit requires the express, written permission
>>      of the authors.
>
> Unfortunately, this clause makes agrep not free software. Indeed, Debian
> distributes it from their non-free repos:
>
> https://packages.debian.org/sid/agrep

This is confusing.  Debian has version 4.17-9 but I don’t even know
where they got it from.  The home page that’s linked there only has 2.x
tarballs.

And this clashes with the declaration of the ICS version in the git
repo.

Weird!  I really don’t mind dropping this patch (I just packaged it
while demonstrating Guix), but it’s sad that the license situation here
is so contradictory.

--
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

bug#26890: [PATCH] gnu: Add agrep.

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> Leo Famulari <leo@famulari.name> writes:
>
>> On Thu, May 11, 2017 at 05:04:08PM -0400, Kei Kebreau wrote:
>>> Quote from copying.agrep in the source directory:
>>>   4. Redistribution for profit requires the express, written permission
>>>      of the authors.
>>
>> Unfortunately, this clause makes agrep not free software. Indeed, Debian
>> distributes it from their non-free repos:
>>
>> https://packages.debian.org/sid/agrep
>
> This is confusing.  Debian has version 4.17-9 but I don’t even know
> where they got it from.  The home page that’s linked there only has 2.x
> tarballs.
>
> And this clashes with the declaration of the ICS version in the git
> repo.
>
> Weird!  I really don’t mind dropping this patch (I just packaged it
> while demonstrating Guix), but it’s sad that the license situation here
> is so contradictory.

So I’m closing this entry if you don’t mind.  :-)

Ludo’.