me
/
guix
Archived
1
0
Fork 0
Code

gnu: python: Remove input labels. 

* gnu/packages/python.scm (python-3.9)[native-inputs]: Remove labels.
(python2-minimal)[inputs]: Likewise.
(python-minimal)[inputs]: Likewise.
Ludovic Courtès 2023-02-23 22:12:59 +01:00
parent df8b8f0c76
commit 7dbd73a329
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 10 additions and 15 deletions
Show Stats 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 ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; 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 © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2017, 2019 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2017, 2019 Eric Bavier <bavier@member.fsf.org>
@ -559,13 +559,13 @@ data types.")
(modify-inputs (package-inputs python-2.7) (modify-inputs (package-inputs python-2.7)
(replace "openssl" openssl))) (replace "openssl" openssl)))
(native-inputs (native-inputs
`(("tzdata" ,tzdata-for-tests) (let ((inputs (modify-inputs (package-native-inputs python-2)
("unzip" ,unzip) (prepend tzdata-for-tests
("zip" ,(@ (gnu packages compression) zip)) unzip
,@(if (%current-target-system) (@ (gnu packages compression) zip)))))
`(("python3" ,this-package)) (if (%current-target-system)
'()) (modify-inputs inputs (prepend this-package))
,@(package-native-inputs python-2))) inputs)))
(native-search-paths (native-search-paths
(list (guix-pythonpath-search-path version) (list (guix-pythonpath-search-path version)
;; Used to locate tzdata by the zoneinfo module introduced in ;; 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 ;; is invoked upon 'make install'. 'pip' also expects 'ctypes' and thus
;; libffi. Expat is needed for XML support which is expected by a lot ;; libffi. Expat is needed for XML support which is expected by a lot
;; of libraries out there. ;; of libraries out there.
(inputs `(("expat" ,expat) (inputs (list expat libffi zlib))))
("libffi" ,libffi)
("zlib" ,zlib)))))
(define-public python-minimal (define-public python-minimal
(package/inherit python (package/inherit python
@ -605,10 +603,7 @@ data types.")
;; OpenSSL is a mandatory dependency of Python 3.x, for urllib; ;; OpenSSL is a mandatory dependency of Python 3.x, for urllib;
;; zlib is required by 'zipimport', used by pip. Expat is needed ;; zlib is required by 'zipimport', used by pip. Expat is needed
;; for XML support, which is generally expected to be available. ;; for XML support, which is generally expected to be available.
(inputs `(("expat" ,expat) (inputs (list expat libffi openssl zlib))))
("libffi" ,libffi)
("openssl" ,openssl)
("zlib" ,zlib)))))
(define-public python-debug (define-public python-debug
(package/inherit python (package/inherit python