Subject: bug#74446: closed (Re: [bug#74446] [PATCH] gnu: liquidprompt: Patch additional utilities)

From: [email-masked] (GNU bug Tracking System)
Date: Fri, 29 Nov 2024 13:41:02 +0000

Your bug report

#74446: [PATCH] gnu: liquidprompt: Patch additional utilities

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
74446: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=74446
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#74446] [PATCH] gnu: liquidprompt: Patch additional utilities
From: Ludovic Courtès <[email-masked]>
To: Sisiutl <[email-masked]>
Cc: [email-masked]
Date: Fri, 29 Nov 2024 14:37:18 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Sisiutl <[email-masked]> skribis:

> * gnu/packages/shellutils.scm (liquidprompt)
> [inputs]: Add coreutils and inetutils.
> [arguments]<#:phases>: Replace the paths of more utilites
>
> Change-Id: I84578ca40300a7527a23e5d8c3257d49be911a7b

Applied, thanks!

Subject: [PATCH] gnu: liquidprompt: Patch additional utilities
From: Sisiutl <[email-masked]>
To: [email-masked]
Cc: Sisiutl <[email-masked]>
Date: Wed, 20 Nov 2024 17:29:30 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/shellutils.scm (liquidprompt)
[inputs]: Add coreutils and inetutils.
[arguments]<#:phases>: Replace the paths of more utilites

Change-Id: I84578ca40300a7527a23e5d8c3257d49be911a7b
---
 gnu/packages/shellutils.scm | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 7e9f85a5f2..74e9429de0 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -47,6 +47,7 @@ (define-module (gnu packages shellutils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system go)
   #:use-module (guix build-system python)
+  #:use-module (gnu packages admin)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bison)
@@ -946,14 +947,19 @@ (define-public liquidprompt
                           (string-append "source "
                                          #$output
                                          "/share/liquidprompt/liquidprompt")))))
-		   (add-after 'fix-plugin 'fix-tput-path
-		     (lambda* (#:key inputs #:allow-other-keys)
-		       (substitute* "liquidprompt"
-			 (("([ (])tput " all beginning)
+                   (add-after 'fix-plugin 'fix-utils-path
+                     (lambda* (#:key inputs #:allow-other-keys)
+                       (substitute* "liquidprompt"
+                         (("([ (])\\\\?(tput|hostname|cksum|uname|tty|grep)([) ])"
+                           all beginning command ending)
                           (string-append beginning
-                                         (search-input-file inputs "bin/tput")
-                                         " "))))))))
-    (inputs (list ncurses))
+                                         (search-input-file
+                                          inputs
+                                          (string-append "bin/" command))
+                                         ending))))))))
+    (inputs (list ncurses
+                  coreutils
+                  inetutils))
     (synopsis "Full-featured prompt for Bash & Zsh")
     (description
      "Liquidprompt is an adaptive prompt for Bash and Zsh that gives
-- 
2.46.0