01/01: gnu: python-pytest: Build with 'bash' instead of 'bash-final'.

[Marius Bakke]

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

commit 60724d69752b24ab3b6b4501925e62726316d28c
Author: Marius Bakke <address@hidden>
Date:   Mon Jun 26 22:43:39 2017 +0200

    gnu: python-pytest: Build with 'bash' instead of 'bash-final'.
    
    Addresses FTBFS after 704243e0c6ec5ac86e2f45aaa469717e60b89124.
    
    * gnu/packages/python.scm (python-pytest)[native-inputs]: Add BASH.
    (python-pytest-3.0)[native-inputs]: Inherit.
---
 gnu/packages/python.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index cbef0e6..ef7b92b 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1877,7 +1877,9 @@ code introspection, and logging.")
     (propagated-inputs
      `(("python-py" ,python-py)))
     (native-inputs
-     `(("python-nose" ,python-nose)
+     `(;; Tests need the "regular" bash since 'bash-final' lacks `compgen`.
+       ("bash" ,bash)
+       ("python-nose" ,python-nose)
        ("python-mock" ,python-mock)))
     (home-page "http://pytest.org";)
     (synopsis "Python testing library")
@@ -1914,9 +1916,8 @@ and many external plugins.")
                                line)))
              #t)))))
     (native-inputs
-     `(("python-nose" ,python-nose)
-       ("python-mock" ,python-mock)
-       ("python-hypothesis" ,python-hypothesis)))
+     `(("python-hypothesis" ,python-hypothesis)
+       ,@(package-native-inputs python-pytest)))
     (properties `((python2-variant . ,(delay python2-pytest-3.0))))))
 
 (define-public python2-pytest-3.0