guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/13: gnu: git-when-merged: Add bash-minimal to inputs.


From: guix-commits
Subject: 06/13: gnu: git-when-merged: Add bash-minimal to inputs.
Date: Fri, 20 Oct 2023 00:24:49 -0400 (EDT)

apteryx pushed a commit to branch core-updates
in repository guix.

commit bec983f7c229510a7a504ab8e6a26d236acbafdd
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Thu Oct 19 23:58:33 2023 -0400

    gnu: git-when-merged: Add bash-minimal to inputs.
    
    * gnu/packages/version-control.scm (git-when-merged)
    [arguments]: Remove trailing #t.
    [inputs]: Add bash-minimal.
    
    Change-Id: I7157e12c52d2ff7197bf02ed878eb8bbe6a5523a
---
 gnu/packages/version-control.scm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 1f05e132dc..fb230fb5f4 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3021,23 +3021,19 @@ directory full of HOWTOs.")
              (lambda* (#:key outputs #:allow-other-keys)
                (install-file "bin/git-when-merged"
                              (string-append (assoc-ref outputs "out")
-                                            "/bin"))
-               #t))
+                                            "/bin"))))
            (add-before 'install 'patch-git
              (lambda* (#:key inputs #:allow-other-keys)
                (let ((git (search-input-file inputs "/bin/git")))
                  (substitute* "bin/git-when-merged"
-                   (("'git'") (string-append "'" git "'")))
-                 #t)))
+                   (("'git'") (string-append "'" git "'"))))))
            (add-after 'install 'wrap-script
              (lambda* (#:key outputs #:allow-other-keys)
                (wrap-program (string-append (assoc-ref outputs "out")
                                             "/bin/git-when-merged")
-                 `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))
-               #t)))))
-      (inputs
-       `(("git" ,git)
-         ("python" ,python-wrapper)))
+                 `("GUIX_PYTHONPATH" ":" prefix
+                   (,(getenv "GUIX_PYTHONPATH")))))))))
+      (inputs (list bash-minimal git python-wrapper))
       (home-page "https://github.com/mhagger/git-when-merged";)
       (synopsis "Determine when a commit was merged into a Git branch")
       (description "This Git extension defines a subcommand,



reply via email to

[Prev in Thread] Current Thread [Next in Thread]