[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/13: gnu: git-imerge: Add bash-minimal to inputs.
From: |
guix-commits |
Subject: |
07/13: gnu: git-imerge: 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 8253f99c963e51f184985cd5fdadbaffe2f9b546
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Oct 20 00:00:04 2023 -0400
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
---
gnu/packages/version-control.scm | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index fb230fb5f4..76c4556d22 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3067,17 +3067,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},
- branch core-updates updated (6d10ec739d -> a6a39b30fc), guix-commits, 2023/10/20
- 02/13: gnu: gitless: Add bash-minimal to inputs, use gexps., guix-commits, 2023/10/20
- 01/13: gnu: git: Add bash-minimal to inputs., guix-commits, 2023/10/20
- 04/13: gnu: myrepos: Add bash-minimal to inputs., guix-commits, 2023/10/20
- 08/13: gnu: git-open: Add bash-minimal to inputs., guix-commits, 2023/10/20
- 10/13: gnu: tkrev: Add bash-minimal to inputs., guix-commits, 2023/10/20
- 07/13: gnu: git-imerge: Add bash-minimal to inputs.,
guix-commits <=
- 13/13: gnu: udiskie: Make bash-minimal input unconditional., guix-commits, 2023/10/20
- 09/13: gnu: diff-so-fancy: Add bash-minimal to inputs., guix-commits, 2023/10/20
- 05/13: gnu: src: Add bash-minimal to inputs, use gexps., guix-commits, 2023/10/20
- 06/13: gnu: git-when-merged: Add bash-minimal to inputs., guix-commits, 2023/10/20
- 11/13: gnu: udisks: Make bash-minimal input unconditional., guix-commits, 2023/10/20
- 03/13: gnu: gitile: Add bash-minimal to inputs, use gexps., guix-commits, 2023/10/20
- 12/13: gnu: perl-file-mimeinfo: Make bash-minimal input unconditional., guix-commits, 2023/10/20