Subject: Re: [bug#32662] shellutils.scm - add hstr
From: [email-masked] (Ludovic Courtès)
To: Benjamin Slade <[email-masked]>
Cc: [email-masked]
Date: Mon, 10 Sep 2018 15:28:48 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hello,

Benjamin Slade <[email-masked]> skribis:

> gnu: Add hstr
>
> * gnu/packages/shellutils.scm (hstr): New variable.

Applied with the changes below: readline and ncurses go to ‘inputs’, not
‘native-inputs’; added ‘file-name’ as suggested by ‘guix lint’; made
full sentences in the description.

In the future could you please send the patch as produced by ‘git
format-patch’?

Thanks for the patch!

Ludo’.

diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm
index b4572f074..425713a91 100644
--- a/gnu/packages/shellutils.scm
+++ b/gnu/packages/shellutils.scm
@@ -174,33 +174,34 @@ below the current cursor position, scrolling the screen if necessary.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "0yk2008bl48hv0v3c90ngq4y45h3nxif2ik6s3l7kag1zs5yv4wd"))))
+                "0yk2008bl48hv0v3c90ngq4y45h3nxif2ik6s3l7kag1zs5yv4wd"))
+              (file-name (string-append name "-" version ".tar.gz"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (replace 'build
+         (add-before 'build 'adjust-ncurses-includes
            (lambda* (#:key make-flags outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
                (substitute* "src/include/hstr_curses.h"
                  (("ncursesw\\/curses.h") "ncurses.h"))
                (substitute* "src/include/hstr.h"
                  (("ncursesw\\/curses.h") "ncurses.h")))
-             (invoke "make")
              #t)))))
     (native-inputs
      `(("autoconf" ,autoconf)
        ("automake" ,automake)
-       ("pkg-config" ,pkg-config)
-       ("ncurses" ,ncurses)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("ncurses" ,ncurses)
        ("readline" ,readline)))
     (synopsis "Navigate and search command history with shell history suggest box")
-    (description "HSTR (HiSToRy) is a command line utility that brings improved
-Bash/zsh command completion from the history.  It aims to make completion easier
-and more efficient than Ctrl-R.  Easily view, navigate and search your command
-history with shell history suggest box for Bash and zsh.  HSTR can also manage
-your command history (for instance you can remove commands that are obsolete
-or contain a piece of sensitive information) or bookmark your favourite
-commands.")
+    (description "HSTR (HiSToRy) is a command-line utility that brings
+improved Bash and Zsh command completion from the history.  It aims to make
+completion easier and more efficient than with @kbd{Ctrl-R}.  It allows you to
+easily view, navigate, and search your command history with suggestion boxes.
+HSTR can also manage your command history (for instance you can remove
+commands that are obsolete or contain a piece of sensitive information) or
+bookmark your favourite commands.")
     (home-page "http://me.mindforger.com/projects/hh.html")
     (license asl2.0)))