diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-12-19 15:15:11 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-12-19 15:15:11 +0200 |
| commit | 6ccf8ea81f95963c0b7f945648106576008ee105 (patch) | |
| tree | f39f596e6c3e98ff1e9f1de0ad41c977e9dd37c1 /gnu/packages/python.scm | |
| parent | fcaed5b81e893f34d77527fbef389ca628ca882d (diff) | |
| parent | 9f916d14765b00309c742fcbff0cfabdd10dcf05 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/python.scm')
| -rw-r--r-- | gnu/packages/python.scm | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 08d7c2f41e..f0d2fd6eb8 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -28,7 +28,6 @@ ;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2016, 2017 Stefan Reichör <stefan@xsteve.at> -;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org> ;;; Copyright © 2016, 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2016, 2017, 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2016–2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr> @@ -43,7 +42,6 @@ ;;; Copyright © 2017 Roel Janssen <roel@gnu.org> ;;; Copyright © 2017, 2018 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> -;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com> ;;; Copyright © 2017 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2018 Ethan R. Jones <ethanrjones97@gmail.com ;;; Copyright © 2018 Fis Trivial <ybbs.daans@hotmail.com> @@ -384,16 +382,16 @@ (add-after 'install 'install-sitecustomize.py ,(customize-site version))))) (inputs - `(("bzip2" ,bzip2) - ("expat" ,expat) - ("gdbm" ,gdbm) - ("libffi" ,libffi) ; for ctypes - ("sqlite" ,sqlite) ; for sqlite extension - ("openssl" ,openssl) - ("readline" ,readline) - ("zlib" ,zlib) - ("tcl" ,tcl) - ("tk" ,tk))) ; for tkinter + (list bzip2 + expat + gdbm + libffi ; for ctypes + sqlite ; for sqlite extension + openssl + readline + zlib + tcl + tk)) ; for tkinter (native-inputs `(("pkg-config" ,pkg-config) ("sitecustomize.py" ,(local-file (search-auxiliary-file @@ -731,7 +729,7 @@ To function properly, this package should not be installed together with the `(("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs - `(("libffi" ,libffi))) + (list libffi)) (home-page "https://micropython.org/") (synopsis "Python implementation for microcontrollers and constrained systems") (description "MicroPython is a lean and efficient implementation of the @@ -766,18 +764,18 @@ ease from the desktop to a microcontroller or embedded system.") ("nss-certs" ,nss-certs) ; For ssl tests ("gzip" ,gzip))) (inputs - `(("libffi" ,libffi) - ("zlib" ,zlib) - ("ncurses" ,ncurses) - ("openssl" ,openssl) - ("expat" ,expat) - ("bzip2" ,bzip2) - ("sqlite" ,sqlite) - ("gdbm" ,gdbm) - ("tcl" ,tcl) - ("tk" ,tk) - ("glibc" ,glibc) - ("xz" ,xz))) ; liblzma + (list libffi + zlib + ncurses + openssl + expat + bzip2 + sqlite + gdbm + tcl + tk + glibc + xz)) ; liblzma (arguments `(#:tests? #f ;FIXME: 43 out of 364 tests are failing #:modules ((ice-9 ftw) (ice-9 match) |