all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#56995] [PATCH] gnu: ugrep: Use gexps and add zstd to inputs.
@ 2022-08-05  4:32 kiasoc5 via Guix-patches via
  2022-08-06  5:37 ` [bug#56995] [PATCH 1/2] gnu: ugrep: Add zstd lib " kiasoc5 via Guix-patches via
  0 siblings, 1 reply; 4+ messages in thread
From: kiasoc5 via Guix-patches via @ 2022-08-05  4:32 UTC (permalink / raw)
  To: 56995; +Cc: kiasoc5

* 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





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#56995] [PATCH 1/2] gnu: ugrep: Add zstd lib to inputs.
  2022-08-05  4:32 [bug#56995] [PATCH] gnu: ugrep: Use gexps and add zstd to inputs kiasoc5 via Guix-patches via
@ 2022-08-06  5:37 ` kiasoc5 via Guix-patches via
  2022-08-06  5:37   ` [bug#56995] [PATCH 2/2] gnu: ugrep: Use gexps kiasoc5 via Guix-patches via
  0 siblings, 1 reply; 4+ messages in thread
From: kiasoc5 via Guix-patches via @ 2022-08-06  5:37 UTC (permalink / raw)
  To: 56995; +Cc: kiasoc5

* 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





^ permalink raw reply	[flat|nested] 4+ messages in thread

* [bug#56995] [PATCH 2/2] gnu: ugrep: Use gexps.
  2022-08-06  5:37 ` [bug#56995] [PATCH 1/2] gnu: ugrep: Add zstd lib " kiasoc5 via Guix-patches via
@ 2022-08-06  5:37   ` kiasoc5 via Guix-patches via
  2022-08-06 14:41     ` bug#56995: " Liliana Marie Prikler
  0 siblings, 1 reply; 4+ messages in thread
From: kiasoc5 via Guix-patches via @ 2022-08-06  5:37 UTC (permalink / raw)
  To: 56995; +Cc: kiasoc5

* 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





^ permalink raw reply	[flat|nested] 4+ messages in thread

* bug#56995: [PATCH 2/2] gnu: ugrep: Use gexps.
  2022-08-06  5:37   ` [bug#56995] [PATCH 2/2] gnu: ugrep: Use gexps kiasoc5 via Guix-patches via
@ 2022-08-06 14:41     ` Liliana Marie Prikler
  0 siblings, 0 replies; 4+ messages in thread
From: Liliana Marie Prikler @ 2022-08-06 14:41 UTC (permalink / raw)
  To: kiasoc5, 56995-done

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




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2022-08-06 14:42 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-05  4:32 [bug#56995] [PATCH] gnu: ugrep: Use gexps and add zstd to inputs kiasoc5 via Guix-patches via
2022-08-06  5:37 ` [bug#56995] [PATCH 1/2] gnu: ugrep: Add zstd lib " kiasoc5 via Guix-patches via
2022-08-06  5:37   ` [bug#56995] [PATCH 2/2] gnu: ugrep: Use gexps kiasoc5 via Guix-patches via
2022-08-06 14:41     ` bug#56995: " Liliana Marie Prikler

Code repositories for project(s) associated with this inbox:

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.