diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-10-20 00:00:04 -0400 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-31 10:42:27 +0200 |
| commit | 0434cac8c02d62d3da359261ed5eaaf9290891c1 (patch) | |
| tree | 67f10d915c3cb806ea48e378ae1702389ffb3779 | |
| parent | 312364b7392d4ec4af10c1c737a1028e4c994e40 (diff) | |
| download | guix-0434cac8c02d62d3da359261ed5eaaf9290891c1.tar guix-0434cac8c02d62d3da359261ed5eaaf9290891c1.tar.gz | |
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
| -rw-r--r-- | gnu/packages/version-control.scm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index f4b0f8dde0..c17af4f89c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -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}, |