Subject: [bug#49327] [PATCH core-updates 004/128] gnu: version-control: Add 'bash' input for 'wrap-program'.

From: Maxime Devos <[email-masked]>
Date: Fri, 2 Jul 2021 12:06:10 +0200

It is required for cross-compilation.
I'm ignoring 'git' for now because there seems to be
some complication involving bash-minimal and bash-for-tests.

* gnu/packages/version-control.scm
  (gitless)[inputs]: Add 'bash-minimal'.
  (cgit)[inputs]: Likewise.
  (gitolite)[inputs]: Likewise.
  (myrepos)[inputs]: Likewise.
  (src)[inputs]: Likewise.
  (git-when-merged)[inputs]: Likewise.
  (git-imerge)[inputs]: Likewise.
  (git-open)[inputs]: Likewise.
  (diff-so-fancy)[inputs]: Likewise.
---
 gnu/packages/version-control.scm | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index c596b8bf89..bcc0ad5a0e 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -682,7 +682,8 @@ logs to GNU ChangeLog format.")
     (native-inputs
      `(("git-for-tests" ,git-minimal)))
     (inputs
-     `(("git" ,git-minimal)
+     `(("bash" ,bash-minimal) ; for 'wrap-program'
+       ("git" ,git-minimal)
        ("python-clint" ,python-clint)
        ("python-pygit2" ,python-pygit2)
        ("python-sh" ,python-sh)))
@@ -989,7 +990,8 @@ collaboration using typical untrusted file hosts or services.")
        ("bzip2" ,bzip2)
        ("xz" ,xz)))
     (inputs
-     `(;; Building cgit requires a Git source tree.
+     `(("bash" ,bash-minimal) ; for wrap-program
+       ;; Building cgit requires a Git source tree.
        ("git-source"
         ,(origin
            (method url-fetch)
@@ -1501,7 +1503,8 @@ also walk each side of a merge and test those changes individually.")
                                   (list out coreutils findutils git))))
                         #t))))))
     (inputs
-     `(("perl" ,perl)
+     `(("bash" ,bash-minimal) ; for wrap-program
+       ("perl" ,perl)
        ("coreutils" ,coreutils)
        ("findutils" ,findutils)
        ("inetutils" ,inetutils)))
@@ -2367,7 +2370,8 @@ modification time.")
                            "perl-uri" "perl-try-tiny"))))
                #t))))))
     (inputs
-     `(("perl" ,perl)
+     `(("bash" ,bash-minimal) ; for wrap-program
+       ("perl" ,perl)
        ("perl-encode-locale" ,perl-encode-locale)
        ("perl-html-parser" ,perl-html-parser)
        ("perl-http-date" ,perl-http-date)
@@ -2666,7 +2670,8 @@ specific files and directories.")
      `(("git" ,git)
        ("perl" ,perl)))
     (inputs
-     `(("python" ,python-wrapper)
+     `(("bash" ,bash-minimal) ; for wrap-program
+       ("python" ,python-wrapper)
        ("rcs" ,rcs)))
     (synopsis "Simple revision control")
     (home-page "http://www.catb.org/~esr/src/")
@@ -2720,7 +2725,8 @@ directory full of HOWTOs.")
                  `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))
                #t)))))
       (inputs
-       `(("git" ,git)
+       `(("bash" ,bash-minimal) ; for 'wrap-program'
+         ("git" ,git)
          ("python" ,python-wrapper)))
       (home-page "https://github.com/mhagger/git-when-merged")
       (synopsis "Determine when a commit was merged into a Git branch")
@@ -2765,7 +2771,8 @@ how information about the merge is displayed.")
                `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))
              #t)))))
     (inputs
-     `(("git" ,git)
+     `(("bash" ,bash-minimal) ; for wrap-program
+       ("git" ,git)
        ("python" ,python-wrapper)))
     (home-page "https://github.com/mhagger/git-imerge")
     (synopsis "Incremental merge for Git")
@@ -2840,7 +2847,8 @@ file contents on a remote server.")
         (base32 "11n46bngvca5wbdbfcxzjhjbfdbad7sgf7h9gf956cb1q8swsdm0"))))
     (build-system copy-build-system)
     (inputs
-     `(("xdg-utils" ,xdg-utils)))
+     `(("bash" ,bash-minimal) ; for wrap-program
+       ("xdg-utils" ,xdg-utils)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -2930,7 +2938,8 @@ for historians.")
                (base32
                 "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl"))))
     (inputs
-     `(("perl" ,perl)
+     `(("bash" ,bash-minimal) ; for wrap-program
+       ("perl" ,perl)
        ("ncurses" ,ncurses)))
     (build-system copy-build-system)
     (arguments
-- 
2.32.0