12/13: gnu: maths: Add 'bash' input for 'wrap-program'.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit b1e9ad1d3fa4da7edd149214354d742bc3373044
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Jul 2 12:06:24 2021 +0200

    gnu: maths: Add 'bash' input for 'wrap-program'.
    
    It is required for cross-compilation.
    
    * gnu/packages/maths.scm
    (units): Fix indentation, remove trailing #t.
    [inputs]: Add bash-minimal and drop labels.
    (feedgnuplot)[inputs]: Add bash-minimal.
    (vuesz)[inputs]: Likewise.
    (lingeling)[inputs]: Likewise.
    
    Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
    Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
    Change-Id: Ifc89d72147d4dbb268410c236a3a2137cd0712a0
---
 gnu/packages/maths.scm | 70 +++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 8cd10a7ab3..75eab86d2a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -415,38 +415,39 @@ programming language.")
 
 (define-public units
   (package
-   (name "units")
-   (version "2.22")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append "mirror://gnu/units/units-" version
-                                ".tar.gz"))
-            (sha256 (base32
-                     "0j2q2a9sgldqwcifsnb7qagsmp8fvj91vfh6v4k7gzi1fwhf24sx"))))
-   (build-system gnu-build-system)
-   (inputs
-    `(("readline" ,readline)
-      ("python" ,python-wrapper)        ;for 'units_cur' script
-      ("python-requests" ,python-requests)))
-   (arguments
-    `(#:phases (modify-phases %standard-phases
-                 (add-after 'install 'wrap-units_cur
-                   (lambda* (#:key outputs #:allow-other-keys)
-                     (let* ((out (assoc-ref outputs "out"))
-                            (bin (string-append out "/bin")))
-                       (wrap-program (string-append bin "/units_cur")
-                         `("GUIX_PYTHONPATH" ":" prefix
-                           ,(search-path-as-string->list (getenv 
"GUIX_PYTHONPATH"))))
-                       #t))))))
-   (synopsis "Conversion between thousands of scales")
-   (description
-    "GNU Units converts numeric quantities between units of measure.  It
+    (name "units")
+    (version "2.22")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnu/units/units-" version
+                                  ".tar.gz"))
+              (sha256 (base32
+                       
"0j2q2a9sgldqwcifsnb7qagsmp8fvj91vfh6v4k7gzi1fwhf24sx"))))
+    (build-system gnu-build-system)
+    (inputs
+     (list bash-minimal       ;for wrap-program
+           readline
+           python-wrapper   ;for 'units_cur' script
+           python-requests))
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-after 'install 'wrap-units_cur
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (bin (string-append out "/bin")))
+                        (wrap-program (string-append bin "/units_cur")
+                          `("GUIX_PYTHONPATH" ":" prefix
+                            ,(search-path-as-string->list
+                              (getenv "GUIX_PYTHONPATH"))))))))))
+    (synopsis "Conversion between thousands of scales")
+    (description
+     "GNU Units converts numeric quantities between units of measure.  It
 can handle scale changes through adaptive usage of standard scale
 prefixes (micro-, kilo-, etc.).  It can also handle nonlinear
 conversions such as Fahrenheit to Celsius.  Its interpreter is powerful
 enough to be used effectively as a scientific calculator.")
-   (license license:gpl3+)
-   (home-page "https://www.gnu.org/software/units/";)))
+    (license license:gpl3+)
+    (home-page "https://www.gnu.org/software/units/";)))
 
 (define-public double-conversion
   (package
@@ -1222,7 +1223,7 @@ singular value problems.")
                `("PERL5LIB" ":" suffix (,PERL5LIB))
                `("PATH" ":" suffix (,(dirname gnuplot))))))))))
     (inputs
-     (list gnuplot perl-list-moreutils vnlog))
+     (list bash-minimal gnuplot perl-list-moreutils vnlog))
     (native-inputs
      ;; For tests.
      (list perl-ipc-run perl-string-shellquote))
@@ -3236,8 +3237,7 @@ ASCII text files using Gmsh's own scripting language.")
          (add-after 'unpack 'fix-sip-dir
            (lambda _
              (substitute* "pyqtdistutils.py"
-               (("os.path.join\\(sip_dir, 'PyQt5'\\)") "sip_dir"))
-             #t))
+               (("os.path.join\\(sip_dir, 'PyQt5'\\)") "sip_dir"))))
          ;; Now we have to pass the correct sip_dir to setup.py.
          (replace 'build
            (lambda* (#:key inputs #:allow-other-keys)
@@ -3245,8 +3245,7 @@ ASCII text files using Gmsh's own scripting language.")
              ((@@ (guix build python-build-system) call-setuppy)
               "build_ext"
               (list (string-append "--sip-dir="
-                                   (search-input-directory inputs 
"share/sip")))
-              #t)))
+                                   (search-input-directory inputs 
"share/sip"))))))
          ;; Ensure that icons are found at runtime.
          (add-after 'install 'wrap-executable
            (lambda* (#:key inputs outputs #:allow-other-keys)
@@ -3260,7 +3259,8 @@ ASCII text files using Gmsh's own scripting language.")
            ;;("python-astropy" ,python-astropy) ;; FIXME: Package this.
            qttools-5 python-sip-4))
     (inputs
-     (list ghostscript ;optional, for EPS/PS output
+     (list bash-minimal
+           ghostscript ;optional, for EPS/PS output
            python-dbus
            python-h5py ;optional, for HDF5 data
            python-pyqt
@@ -7942,7 +7942,7 @@ symbolic reasoning engines that need to reason about 
polynomial constraints.")
                        ;; values to construct commands (yes, eww), so we
                        ;; can't easily substitute* them.
                        '("lglddtrace" "lgluntrace" "lingeling" 
"plingeling"))))))))
-     (inputs (list `(,aiger "static") gzip bzip2 xz p7zip))
+     (inputs (list `(,aiger "static") bash-minimal gzip bzip2 xz p7zip))
      (home-page "http://fmv.jku.at/lingeling";)
      (synopsis "SAT solver")
      (description "This package provides a range of SAT solvers, including