GNU bug report logs - #56995
[PATCH] gnu: ugrep: Use gexps and add zstd to inputs.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 56995 in the body.
You can then email your comments to 56995 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: kiasoc5 <kiasoc5 <at> disroot.org>
To: guix-patches <at> gnu.org
Cc: kiasoc5 <kiasoc5 <at> disroot.org>
Subject: [PATCH] gnu: ugrep: Use gexps and add zstd to inputs.
Date: Fri,  5 Aug 2022 00:32:56 -0400

* gnu/packages/search.scm (ugrep)[snippets]: Remove trailing #t.
[arguments]: Use gexps.
[inputs]: Add zstd.
---
 gnu/packages/search.scm | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index db5579a708..620c8dbe1f 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -32,6 +32,7 @@ (define-module (gnu packages search)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
@@ -687,8 +688,7 @@ (define-public ugrep
                   (delete-file-recursively "bin") ; pre-built executables
                   (for-each delete-file (find-files "tests" "^archive\\..*"))
                   (for-each delete-file (find-files "tests" "^.*\\.pdf$"))
-                  (for-each delete-file (find-files "tests" "^.*\\.class$"))
-                  #t))))
+                  (for-each delete-file (find-files "tests" "^.*\\.class$"))))))
     (build-system gnu-build-system)
     (inputs
      (list bzip2
@@ -696,18 +696,20 @@ (define-public ugrep
            lz4
            lzip ;; lzma
            pcre2
-           zlib))
+           zlib
+           zstd))
     (arguments
-     `(#:tests? #f                  ; no way to rebuild the binary input files
-       #:test-target "test"
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'check-setup
-           (lambda _
-             ;; Unpatch shebangs in tests.
-             (substitute* '("tests/Hello.bat"
-                            "tests/Hello.sh")
-               (("#!/gnu/store/.*/bin/sh") "#!/bin/sh")))))))
+     (list
+      #:tests? #f                  ; no way to rebuild the binary input files
+      #:test-target "test"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'check-setup
+            (lambda _
+              ;; Unpatch shebangs in tests.
+              (substitute* '("tests/Hello.bat"
+                             "tests/Hello.sh")
+                (("#!/gnu/store/.*/bin/sh") "#!/bin/sh")))))))
     (home-page "https://github.com/Genivia/ugrep/")
     (synopsis "Faster grep with an interactive query UI")
     (description "Ugrep is a ultra fast searcher of file systems, text
-- 
2.37.1

Message #8 received at 56995 <at> debbugs.gnu.org (full text, mbox):

From: kiasoc5 <kiasoc5 <at> disroot.org>
To: paren <at> disroot.org, 56995 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: ugrep: Use gexps and add zstd lib to inputs.
Date: Fri, 5 Aug 2022 05:14:56 +0000

On Fri, Aug 05 2022, 01:10:00 AM -0400
kiasoc5 <kiasoc5 <at> disroot.org> wrote:

> Last email had old version of patch, please use this one. Sorry paren
> for using cc instead of reply-to.

Also forgot to check my git-send email arguments. Sending to the
correct issue.

> * gnu/packages/search.scm (ugrep)[snippets]: Use gexps. Remove
> trailing #t. [snippets]: Use gexps.
> [arguments]: Likewise.
> [inputs]: Add zstd lib.
> ---
>  gnu/packages/search.scm | 33 +++++++++++++++++----------------
>  1 file changed, 17 insertions(+), 16 deletions(-)
> 
> diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
> index db5579a708..65a642c259 100644
> --- a/gnu/packages/search.scm
> +++ b/gnu/packages/search.scm
> @@ -32,6 +32,7 @@ (define-module (gnu packages search)
>    #:use-module (guix packages)
>    #:use-module (guix download)
>    #:use-module (guix git-download)
> +  #:use-module (guix gexp)
>    #:use-module (guix utils)
>    #:use-module (guix build-system gnu)
>    #:use-module (guix build-system perl)
> @@ -681,14 +682,12 @@ (define-public ugrep
>                (sha256
>                 (base32
> "03b3lahc3zzsznaqnrk47f1cnd5jwakvwrkz0r4m2crk09cpfv57")) (file-name
> (git-file-name name version))
> -              (modules '((guix build utils)))
> -              (snippet
> -               '(begin
> +              (snippet #~(begin
> +                  (use-modules (guix build utils))
>                    (delete-file-recursively "bin") ; pre-built
> executables (for-each delete-file (find-files "tests"
> "^archive\\..*")) (for-each delete-file (find-files "tests"
> "^.*\\.pdf$"))
> -                  (for-each delete-file (find-files "tests"
> "^.*\\.class$"))
> -                  #t))))
> +                  (for-each delete-file (find-files "tests"
> "^.*\\.class$")))))) (build-system gnu-build-system)
>      (inputs
>       (list bzip2
> @@ -696,18 +695,20 @@ (define-public ugrep
>             lz4
>             lzip ;; lzma
>             pcre2
> -           zlib))
> +           zlib
> +           `(,zstd "lib"))
>      (arguments
> -     `(#:tests? #f                  ; no way to rebuild the binary
> input files
> -       #:test-target "test"
> -       #:phases
> -       (modify-phases %standard-phases
> -         (add-before 'check 'check-setup
> -           (lambda _
> -             ;; Unpatch shebangs in tests.
> -             (substitute* '("tests/Hello.bat"
> -                            "tests/Hello.sh")
> -               (("#!/gnu/store/.*/bin/sh") "#!/bin/sh")))))))
> +     (list
> +      #:tests? #f                  ; no way to rebuild the binary
> input files
> +      #:test-target "test"
> +      #:phases
> +      #~(modify-phases %standard-phases
> +          (add-before 'check 'check-setup
> +            (lambda _
> +              ;; Unpatch shebangs in tests.
> +              (substitute* '("tests/Hello.bat"
> +                             "tests/Hello.sh")
> +                (("#!/gnu/store/.*/bin/sh") "#!/bin/sh")))))))
>      (home-page "https://github.com/Genivia/ugrep/")
>      (synopsis "Faster grep with an interactive query UI")
>      (description "Ugrep is a ultra fast searcher of file systems,
> text

Message #11 received at 56995 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> ist.tugraz.at>
To: kiasoc5 <kiasoc5 <at> disroot.org>, paren <at> disroot.org, 56995 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: ugrep: Use gexps and add zstd lib to inputs.
Date: Fri, 05 Aug 2022 09:35:59 +0200

Am Freitag, dem 05.08.2022 um 05:14 +0000 schrieb kiasoc5:

> Use gexps and add zstd lib to inputs.
Useful hint: If your patch title contains "and", it probably should be
a series of two or more patches.  😉️

Cheers

Message #14 received at 56995 <at> debbugs.gnu.org (full text, mbox):

From: kiasoc5 <kiasoc5 <at> disroot.org>
To: 56995 <at> debbugs.gnu.org
Cc: kiasoc5 <kiasoc5 <at> disroot.org>
Subject: [PATCH 1/2] gnu: ugrep: Add zstd lib to inputs.
Date: Sat,  6 Aug 2022 01:37:50 -0400

* gnu/packages/search.scm (ugrep)[inputs]: Add zstd lib.
---
 gnu/packages/search.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index db5579a708..175a31cd5d 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -696,7 +696,8 @@ (define-public ugrep
            lz4
            lzip ;; lzma
            pcre2
-           zlib))
+           zlib
+           `(,zstd "lib"))
     (arguments
      `(#:tests? #f                  ; no way to rebuild the binary input files
        #:test-target "test"
-- 
2.37.1

Message #17 received at 56995 <at> debbugs.gnu.org (full text, mbox):

From: kiasoc5 <kiasoc5 <at> disroot.org>
To: 56995 <at> debbugs.gnu.org
Cc: kiasoc5 <kiasoc5 <at> disroot.org>
Subject: [PATCH 2/2] gnu: ugrep: Use gexps.
Date: Sat,  6 Aug 2022 01:37:52 -0400

* gnu/packages/search.scm (ugrep)[source]: Convert snippet to gexp.
[arguments]: Use gexps.
---
 gnu/packages/search.scm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index 175a31cd5d..34dc6d5faf 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -32,6 +32,7 @@ (define-module (gnu packages search)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix gexp)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system perl)
@@ -681,14 +682,12 @@ (define-public ugrep
               (sha256
                (base32 "03b3lahc3zzsznaqnrk47f1cnd5jwakvwrkz0r4m2crk09cpfv57"))
               (file-name (git-file-name name version))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  (delete-file-recursively "bin") ; pre-built executables
-                  (for-each delete-file (find-files "tests" "^archive\\..*"))
-                  (for-each delete-file (find-files "tests" "^.*\\.pdf$"))
-                  (for-each delete-file (find-files "tests" "^.*\\.class$"))
-                  #t))))
+              (snippet #~(begin
+                           (use-modules (guix build utils))
+                           (delete-file-recursively "bin") ; pre-built executables
+                           (for-each delete-file (find-files "tests" "^archive\\..*"))
+                           (for-each delete-file (find-files "tests" "^.*\\.pdf$"))
+                           (for-each delete-file (find-files "tests" "^.*\\.class$"))))))
     (build-system gnu-build-system)
     (inputs
      (list bzip2
@@ -698,18 +697,19 @@ (define-public ugrep
            pcre2
            zlib
            `(,zstd "lib"))
-    (arguments
-     `(#:tests? #f                  ; no way to rebuild the binary input files
+     (arguments
+      (list
+       #:tests? #f                  ; no way to rebuild the binary input files
        #:test-target "test"
        #:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'check-setup
-           (lambda _
-             ;; Unpatch shebangs in tests.
-             (substitute* '("tests/Hello.bat"
-                            "tests/Hello.sh")
-               (("#!/gnu/store/.*/bin/sh") "#!/bin/sh")))))))
-    (home-page "https://github.com/Genivia/ugrep/")
+       #~(modify-phases %standard-phases
+           (add-before 'check 'check-setup
+             (lambda _
+               ;; Unpatch shebangs in tests.
+               (substitute* '("tests/Hello.bat"
+                              "tests/Hello.sh")
+                 (("#!/gnu/store/.*/bin/sh") "#!/bin/sh")))))))
+     (home-page "https://github.com/Genivia/ugrep/")
     (synopsis "Faster grep with an interactive query UI")
     (description "Ugrep is a ultra fast searcher of file systems, text
 and binary files, source code, archives, compressed files, documents, and
-- 
2.37.1

Message #22 received at 56995-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: kiasoc5 <kiasoc5 <at> disroot.org>, 56995-done <at> debbugs.gnu.org
Subject: Re: [PATCH 2/2] gnu: ugrep: Use gexps.
Date: Sat, 06 Aug 2022 16:41:15 +0200

Am Samstag, dem 06.08.2022 um 01:37 -0400 schrieb kiasoc5:
> * gnu/packages/search.scm (ugrep)[source]: Convert snippet to gexp.
> [arguments]: Use gexps.
Pushed with a fix on the first patch and slightly modified ChangeLog.

Cheers

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.