amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'savannah/master' into core-updates

Browse source 
Conflicts:
	gnu/local.mk
	gnu/packages/autotools.scm
	gnu/packages/cmake.scm
	gnu/packages/gnuzilla.scm
	gnu/packages/haskell.scm
	gnu/packages/pdf.scm
	gnu/packages/python-xyz.scm
	gnu/packages/samba.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/wxwidgets.scm
This commit is contained in:
Christopher Baines 2023-03-02 10:37:28 +00:00
commit 7df09ee0ab
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
402 changed files with 27182 additions and 15696 deletions
Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/python.scm
View file

@ -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>
@ -561,13 +561,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
@ -594,9 +594,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
@ -607,10 +605,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