~ruther/guix-local: gnu: git-imerge: Add bash-minimal to inputs.

0434cac8c02d62d3da359261ed5eaaf9290891c1 — Maxim Cournoyer 2 years ago 312364b

gnu: git-imerge: Add bash-minimal to inputs.

* gnu/packages/version-control.scm (git-imerge)
[arguments]: Remove trailing #t.
[inputs]: Add bash-minimal.

Change-Id: Ic699a7bbb27fd509cd03d969d9d396f2deaaec08

patch browse .tar.gz

1 files changed, 4 insertions(+), 7 deletions(-)

M gnu/packages/version-control.scm

M gnu/packages/version-control.scm => gnu/packages/version-control.scm +4 -7

@@ 3471,17 3471,14 @@ how information about the merge is displayed.")
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((git (search-input-file inputs "/bin/git")))
                (substitute* "git-imerge"
-                 (("'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-imerge")
-               `("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-imerge")
     (synopsis "Incremental merge for Git")
     (description "This Git extension defines a subcommand, @code{imerge},