unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Ashish SHUKLA via Guix-patches via <guix-patches@gnu.org>
To: 74611@debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is@lostca.se>
Subject: [bug#74611] [PATCH v2] gnu: ugrep: Update to 7.1.1.
Date: Sat, 30 Nov 2024 13:33:05 +0100	[thread overview]
Message-ID: <e7431510fd1f0624aef8e57bfc2fac2031715037.1732969984.git.ashish.is@lostca.se> (raw)
In-Reply-To: <01914ee4fb95ab9df4b9f13c207c72b0f160e3b5.1732922038.git.ashish.is@lostca.se>

* 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





      reply	other threads:[~2024-11-30 12:36 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-29 23:13 [bug#74611] [PATCH] gnu: ugrep: Update to 7.1.1 Ashish SHUKLA via Guix-patches via
2024-11-30 12:33 ` Ashish SHUKLA via Guix-patches via [this message]

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=e7431510fd1f0624aef8e57bfc2fac2031715037.1732969984.git.ashish.is@lostca.se \
    --to=guix-patches@gnu.org \
    --cc=74611@debbugs.gnu.org \
    --cc=ashish.is@lostca.se \
    /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).