emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#56995: closed ([PATCH] gnu: ugrep: Use gexps and add zstd to inputs.


From: GNU bug Tracking System
Subject: bug#56995: closed ([PATCH] gnu: ugrep: Use gexps and add zstd to inputs.)
Date: Sat, 06 Aug 2022 14:42:01 +0000

Your message dated Sat, 06 Aug 2022 16:41:15 +0200
with message-id <a7d22d6736d0cbe982aba8bdca0e1282dcbc2d90.camel@gmail.com>
and subject line Re: [PATCH 2/2] gnu: ugrep: Use gexps.
has caused the debbugs.gnu.org bug report #56995,
regarding [PATCH] gnu: ugrep: Use gexps and add zstd to inputs.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
56995: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=56995
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
--- Begin Message --- 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




--- End Message ---
--- Begin Message --- Subject: Re: [PATCH 2/2] gnu: ugrep: Use gexps. Date: Sat, 06 Aug 2022 16:41:15 +0200 User-agent: Evolution 3.42.1
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


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]