guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

40/55: gnu: python-distlib: Don't reference the implicit bash input.


From: guix-commits
Subject: 40/55: gnu: python-distlib: Don't reference the implicit bash input.
Date: Thu, 21 Sep 2023 13:31:39 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit a0aff95db93f2730b57fe3411fdf2e1d8eb194ff
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Sep 10 15:34:49 2023 +0800

    gnu: python-distlib: Don't reference the implicit bash input.
    
    * gnu/packages/python-xyz.scm (python-distlib)[inputs]: Add BASH-MINIMAL.
    [arguments]: Use SEARCH-INPUT-FILE instead of WHICH.
---
 gnu/packages/python-xyz.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b574ec2efe..5445318157 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8551,9 +8551,10 @@ and therefore easier to read and write.")
       #:phases
       #~(modify-phases %standard-phases
           (add-before 'build 'no-/bin/sh
-            (lambda _
-              (substitute* '("distlib/scripts.py" "tests/test_scripts.py")
-                (("/bin/sh") (which "sh")))))
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((/bin/sh (search-input-file inputs "bin/sh")))
+                (substitute* '("distlib/scripts.py" "tests/test_scripts.py")
+                  (("/bin/sh") /bin/sh)))))
           (add-before 'check 'prepare-test-environment
             (lambda _
               (setenv "HOME" "/tmp")
@@ -8561,6 +8562,8 @@ and therefore easier to read and write.")
               (setenv "SKIP_ONLINE" "1"))))))
     (native-inputs
      (list python-pytest))
+    (inputs
+     (list bash-minimal))
     (home-page "https://github.com/pypa/distlib";)
     (synopsis "Distribution utilities")
     (description "Distlib is a library which implements low-level functions 
that



reply via email to

[Prev in Thread] Current Thread [Next in Thread]