From: kiasoc5 via Guix-patches via <guix-patches@gnu.org>
To: 56984@debbugs.gnu.org
Cc: kiasoc5 <kiasoc5@disroot.org>
Subject: [bug#56984] [PATCH] gnu: ugrep: Use gexps and add zstd lib to inputs.
Date: Fri, 5 Aug 2022 01:10:00 -0400 [thread overview]
Message-ID: <20220805050959.344944-1-kiasoc5@disroot.org> (raw)
In-Reply-To: <20220804203726.44fb38aa@aria>
Last email had old version of patch, please use this one. Sorry paren
for using cc instead of reply-to.
* 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
--
2.37.1
next prev parent reply other threads:[~2022-08-05 5:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-04 20:37 [bug#56984] [PATCH] gnu: openh264: Update to 2.3.0 kiasoc5 via Guix-patches via
2022-08-04 20:53 ` ( via Guix-patches via
2022-08-05 4:44 ` [bug#56984] [PATCH V2] gnu: openh264: Update to 2.3.0 and use gexps kiasoc5 via Guix-patches via
2022-08-10 8:29 ` bug#56984: [PATCH] gnu: openh264: Update to 2.3.0 宋文武 via Guix-patches via
2022-08-05 5:04 ` [bug#56984] [PATCH V3] gnu: ugrep: Use gexps and add zstd lib to inputs kiasoc5 via Guix-patches via
2022-08-05 5:10 ` kiasoc5 via Guix-patches via [this message]
2022-08-05 5:14 ` [bug#56995] [PATCH] " kiasoc5 via Guix-patches via
2022-08-05 7:35 ` Liliana Marie Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220805050959.344944-1-kiasoc5@disroot.org \
--to=guix-patches@gnu.org \
--cc=56984@debbugs.gnu.org \
--cc=kiasoc5@disroot.org \
--cc=paren@disroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).