GNU bug report logs - #67942
[PATCH] gnu: Add liquidprompt.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 67942 in the body.
You can then email your comments to 67942 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Romain GARBAGE <romain.garbage <at> inria.fr>
To: guix-patches <at> gnu.org
Cc: Romain GARBAGE <romain.garbage <at> inria.fr>
Subject: [PATCH] gnu: Add liquidprompt.
Date: Wed, 20 Dec 2023 16:50:34 +0100

* gnu/packages/shellutils.scm (liquidprompt): New variable.

Change-Id: I0004568df6dd6011f5e65c9894ce97a8c2533f84
---
 gnu/packages/shellutils.scm | 62 +++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 671848fd27..4288d5362a 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -791,3 +791,65 @@ (define-public grc
 @end example
 ")
     (license license:gpl2)))
+
+(define-public liquidprompt
+  (package
+    (name "liquidprompt")
+    (version "2.1.2")
+    (home-page "https://github.com/liquidprompt/liquidprompt")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/liquidprompt/liquidprompt")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0ljlq97mh84d6g6r3abb254vrwrdan5v74b69fpd62d7p9ffnsgf"))))
+    (build-system copy-build-system)
+    (arguments
+     (list
+      #:install-plan #~'(("liquidpromptrc-dist" "etc/liquidpromptrc")
+                         ("example.bashrc" "share/liquidprompt/examples/")
+                         ("liquid.ps1" "share/liquidprompt/examples/")
+                         ("liquidprompt" "share/liquidprompt/")
+                         ("contrib" "share/liquidprompt/")
+                         ("themes" "share/liquidprompt/")
+                         ("liquidprompt.plugin.zsh"
+                          "share/zsh/plugins/liquidprompt/")
+                         ("docs" #$(string-append "share/doc/" name "-"
+                                                  version "/")))
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'unpack 'fix-plugin
+                     (lambda _
+                       (substitute* "liquidprompt.plugin.zsh"
+                         (("source(.*)$")
+                          (string-append "source "
+                                         #$output
+                                         "/share/liquidprompt/liquidprompt")))))
+		   (add-after 'fix-plugin 'fix-tput-path
+		     (lambda _
+		       (substitute* "liquidprompt"
+			 (("([ (])tput " all beg) (string-append beg #$ncurses "/bin/tput "))))))))
+    (synopsis "Full-featured prompt for Bash & Zsh")
+    (description
+     "Liquidprompt is an adaptive prompt for Bash and Zsh that gives
+you a nicely displayed prompt with useful information when you need it. It
+does this with a powerful theming engine and a large array of data sources.
+
+In order to use liquidprompt with Zsh, you should use the following snippet
+with @code{guix home}:
+@example
+(services (list ;;...
+            (service home-zsh-service-type
+                     (home-zsh-configuration
+                       (zshrc (list ;;...
+                                ;; This loads liquidprompt
+                                (mixed-text-file \"liquidprompt\"
+                                                 \"[[ $- = *i* ]] && source \" liquidprompt \"/share/liquidprompt/liquidprompt\")
+                                ;; This loads the powerline theme available in liquidprompt
+                                (mixed-text-file \"powerline-theme\"
+                                                 \"source \" liquidprompt \"/share/liquidprompt/themes/powerline/powerline.theme\")))))))
+@end example
+")
+    (license license:agpl3)))
-- 
2.41.0

Message #10 received at 67942-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Romain GARBAGE <romain.garbage <at> inria.fr>
Cc: 67942-done <at> debbugs.gnu.org
Subject: Re: [bug#67942] [PATCH] gnu: Add liquidprompt.
Date: Fri, 22 Dec 2023 17:38:06 +0100

[Message part 1 (text/plain, inline)]

Hello! :-)

Romain GARBAGE <romain.garbage <at> inria.fr> skribis:

> * gnu/packages/shellutils.scm (liquidprompt): New variable.
>
> Change-Id: I0004568df6dd6011f5e65c9894ce97a8c2533f84

Nice!  I took the liberty to make the changes below: license is AGPLv3+
because source code does not say otherwise, I change the direct
reference to ‘ncurses’ to an input + ‘search-input-file’ (that way,
users could inherit from the package, provided it a different
‘tput’-providing package, and it’d just work), and shrinked the
synopsis.

Thank you!

Ludo’.

[Message part 2 (text/x-patch, inline)]

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index 4288d5362a..f010a50538 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -828,9 +828,13 @@ (define-public liquidprompt
                                          #$output
                                          "/share/liquidprompt/liquidprompt")))))
 		   (add-after 'fix-plugin 'fix-tput-path
-		     (lambda _
+		     (lambda* (#:key inputs #:allow-other-keys)
 		       (substitute* "liquidprompt"
-			 (("([ (])tput " all beg) (string-append beg #$ncurses "/bin/tput "))))))))
+			 (("([ (])tput " all beginning)
+                          (string-append beginning
+                                         (search-input-file inputs "bin/tput")
+                                         " "))))))))
+    (inputs (list ncurses))
     (synopsis "Full-featured prompt for Bash & Zsh")
     (description
      "Liquidprompt is an adaptive prompt for Bash and Zsh that gives
@@ -838,18 +842,17 @@ (define-public liquidprompt
 does this with a powerful theming engine and a large array of data sources.
 
 In order to use liquidprompt with Zsh, you should use the following snippet
-with @code{guix home}:
+with Guix Home:
+
 @example
-(services (list ;;...
-            (service home-zsh-service-type
-                     (home-zsh-configuration
-                       (zshrc (list ;;...
-                                ;; This loads liquidprompt
-                                (mixed-text-file \"liquidprompt\"
-                                                 \"[[ $- = *i* ]] && source \" liquidprompt \"/share/liquidprompt/liquidprompt\")
-                                ;; This loads the powerline theme available in liquidprompt
-                                (mixed-text-file \"powerline-theme\"
-                                                 \"source \" liquidprompt \"/share/liquidprompt/themes/powerline/powerline.theme\")))))))
-@end example
-")
-    (license license:agpl3)))
+(service home-zsh-service-type
+         (home-zsh-configuration
+           (zshrc (list ;;...
+                    ;; This loads liquidprompt
+                    (mixed-text-file \"liquidprompt\"
+                                     \"[[ $- = *i* ]] && source \" liquidprompt \"/share/liquidprompt/liquidprompt\")
+                    ;; This loads the powerline theme available in liquidprompt
+                    (mixed-text-file \"powerline-theme\"
+                                     \"source \" liquidprompt \"/share/liquidprompt/themes/powerline/powerline.theme\"))))))
+@end example\n")
+    (license license:agpl3+)))

Previous Next

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