GNU bug report logs - #74611
[PATCH] gnu: ugrep: Update to 7.1.1.

Previous Next

Full log

View this message in rfc822 format

From: Ashish SHUKLA <ashish.is <at> lostca.se>
To: 74611 <at> debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [bug#74611] [PATCH v2] gnu: ugrep: Update to 7.1.1.
Date: Sat, 30 Nov 2024 13:33:05 +0100

* gnu/packages/search.scm (ugrep): Update to 7.1.1.
[arguments]<phases>: Add fix-ug+ phase to wrap ugrep+,
and ug+ binaries.

Change-Id: I5292ace64c4d8457748018d852145324b981e9b0
---
Hi,

This revision also wraps the programs ug+, and ugrep+ which expect ugrep in the PATH.

Thanks!

 gnu/packages/search.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm
index bd24d98639..e1f498446a 100644
--- a/gnu/packages/search.scm
+++ b/gnu/packages/search.scm
@@ -739,14 +739,14 @@ (define-public xapers
 (define-public ugrep
   (package
     (name "ugrep")
-    (version "7.1.0")
+    (version "7.1.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/Genivia/ugrep")
                     (commit (string-append "v" version))))
               (sha256
-               (base32 "0py6yyjdabgxdlidiq30432b4drd2821d3k68zq373v0jwz3crqz"))
+               (base32 "0x162hf65fwx21ld3ac73sblj1vxvmaqicz3220bw8wb8fvhgw4p"))
               (file-name (git-file-name name version))
               (modules '((guix build utils)))
               (snippet
@@ -773,6 +773,13 @@ (define-public ugrep
       #:test-target "test"
       #:phases
       #~(modify-phases %standard-phases
+          (add-after 'install 'fixup-ug+
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
+                (for-each (lambda (f)
+                            (wrap-program (string-append bin "/" f)
+                              `("PATH" ":" prefix (,bin))))
+                          (list "ug+" "ugrep+")))))
           (add-before 'check 'check-setup
             (lambda _
               ;; Unpatch shebangs in tests.

base-commit: f129a6cc591817c5c51770d5b8712eeb344ba4e4
-- 
2.47.1

Previous Next

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