Subject: [PATCH core-updates 030/128] gnu: guile-xyz: Add 'bash' input for 'wrap-program'.

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

It is required for cross-compilation.

* gnu/packages/guile-xyz.scm
  (artanis)[inputs]: Add 'bash-minimal'.
  (guile-dsv)[inputs]: Likewise.
  (guile-hall)[inputs]: Likewise.
  (python-on-guile)[inputs]: Likewise.
  (haunt)[inputs]: Likewise.
  (emacsy)[inputs]: Likewise.
  (nomad)[inputs]: Likewise.
---
 gnu/packages/guile-xyz.scm | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index e4164d2c47..211ac441c1 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -167,7 +167,8 @@
                   #t))))
     (build-system gnu-build-system)
     (inputs
-     `(("guile" ,guile-2.2)
+     `(("bash" ,bash-minimal) ; for wrap-program
+       ("guile" ,guile-2.2)
        ("nss" ,nss)))
     ;; FIXME the bundled csv contains one more exported procedure
     ;; (sxml->csv-string) than guile-csv. The author is maintainer of both
@@ -529,7 +530,8 @@ you send to a FIFO file.")
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("texinfo" ,texinfo)))
-    (inputs `(("guile" ,guile-3.0)))
+    (inputs `(("bash" ,bash-minimal) ; for wrap-program
+              ("guile" ,guile-3.0)))
     (propagated-inputs `(("guile-lib" ,guile-lib)))
     (arguments
      `(#:modules (((guix build guile-build-system)
@@ -1690,7 +1692,8 @@ above command-line parameters.")
         ("automake" ,automake)
         ("pkg-config" ,pkg-config)
         ("texinfo" ,texinfo)))
-    (inputs `(("guile" ,guile-3.0)))
+    (inputs `(("bash" ,bash-minimal) ; for wrap-program
+              ("guile" ,guile-3.0)))
     (propagated-inputs
      `(("guile-config" ,guile-config)))
     (synopsis "Guile project tooling")
@@ -2492,9 +2495,10 @@ inspired by the SCSH regular expression system.")
      `(("pkg-config" ,pkg-config)
        ("texinfo" ,texinfo)))
     (inputs
-     ;; Depend on the latest Guile to avoid bytecode compatibility issues when
-     ;; using modules built against the latest version.
-     `(("guile" ,guile-3.0-latest)))
+     `(("bash" ,bash-minimal) ; for wrap-program
+       ;; Depend on the latest Guile to avoid bytecode compatibility issues
+       ;; when using modules built against the latest version.
+       ("guile" ,guile-3.0-latest)))
     (propagated-inputs
      `(("guile-reader" ,guile-reader)
        ("guile-commonmark" ,guile-commonmark)))
@@ -2956,7 +2960,8 @@ serializing continuations or delimited continuations.")
                    (,compiled-path)))
                #t))))))
     (inputs
-     `(("guile" ,guile-3.0)
+     `(("bash" ,bash-minimal) ; for wrap-program
+       ("guile" ,guile-3.0)
        ("guile-persist" ,guile-persist)
        ("guile-readline" ,guile-readline)
        ("guile-stis-parser" ,guile-stis-parser)))
@@ -3276,7 +3281,8 @@ API.")
        ("texinfo" ,texinfo)
        ("texlive" ,(texlive-updmap.cfg (list texlive-generic-epsf)))))
     (inputs
-     `(("dbus-glib" ,dbus-glib)
+     `(("bash" ,bash-minimal) ; for wrap-program
+       ("dbus-glib" ,dbus-glib)
        ("guile" ,guile-3.0)
        ("guile-lib" ,guile-lib)
        ("guile-readline" ,guile-readline)
@@ -3429,7 +3435,8 @@ perform geometrical transforms on JPEG images.")
        ("gettext" ,gettext-minimal)
        ("perl" ,perl)))
     (inputs
-     `(;; Guile
+     `(("bash" ,bash-minimal) ; for wrap-program
+       ;; Guile
        ("guile" ,guile-2.2)
        ("guile-lib" ,guile2.2-lib)
        ("guile-readline" ,guile2.2-readline)
-- 
2.32.0