diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/packages/python.scm | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in:
gnu/packages/ibus.scm
gnu/packages/image.scm
gnu/packages/lisp.scm
gnu/packages/virtualization.scm
Diffstat (limited to 'gnu/packages/python.scm')
| -rw-r--r-- | gnu/packages/python.scm | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0c164d7991..077814719d 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2021, 2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2017, 2019 Eric Bavier <bavier@member.fsf.org> @@ -559,13 +559,13 @@ data types.") (modify-inputs (package-inputs python-2.7) (replace "openssl" openssl))) (native-inputs - `(("tzdata" ,tzdata-for-tests) - ("unzip" ,unzip) - ("zip" ,(@ (gnu packages compression) zip)) - ,@(if (%current-target-system) - `(("python3" ,this-package)) - '()) - ,@(package-native-inputs python-2))) + (let ((inputs (modify-inputs (package-native-inputs python-2) + (prepend tzdata-for-tests + unzip + (@ (gnu packages compression) zip))))) + (if (%current-target-system) + (modify-inputs inputs (prepend this-package)) + inputs))) (native-search-paths (list (guix-pythonpath-search-path version) ;; Used to locate tzdata by the zoneinfo module introduced in @@ -592,9 +592,7 @@ data types.") ;; is invoked upon 'make install'. 'pip' also expects 'ctypes' and thus ;; libffi. Expat is needed for XML support which is expected by a lot ;; of libraries out there. - (inputs `(("expat" ,expat) - ("libffi" ,libffi) - ("zlib" ,zlib))))) + (inputs (list expat libffi zlib)))) (define-public python-minimal (package/inherit python @@ -605,10 +603,7 @@ data types.") ;; OpenSSL is a mandatory dependency of Python 3.x, for urllib; ;; zlib is required by 'zipimport', used by pip. Expat is needed ;; for XML support, which is generally expected to be available. - (inputs `(("expat" ,expat) - ("libffi" ,libffi) - ("openssl" ,openssl) - ("zlib" ,zlib))))) + (inputs (list expat libffi openssl zlib)))) (define-public python-debug (package/inherit python |