1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-15 11:30:44 +02:00

Merge branch 'master' into ungrafting

This commit is contained in:
Marius Bakke 2020-12-21 23:42:10 +01:00
commit bbe4ed65ed
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
149 changed files with 47062 additions and 2760 deletions

View file

@ -521,6 +521,31 @@ data types.")
(version-major+minor version)
"/site-packages"))))))))
(define-public python-3.9
(package (inherit python-3.8)
(name "python-next")
(version "3.9.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.python.org/ftp/python/"
version "/Python-" version ".tar.xz"))
(patches (search-patches
"python-3.9-fix-tests.patch"
"python-3-deterministic-build-info.patch"
"python-3-search-paths.patch"))
(sha256
(base32
"1zq3k4ymify5ig739zyvx9s2ainvchxb1zpy139z74krr653y74r"))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete the bundled copy of libexpat.
(delete-file-recursively "Modules/expat")
(substitute* "Modules/Setup"
;; Link Expat instead of embedding the bundled one.
(("^#pyexpat.*") "pyexpat pyexpat.c -lexpat\n"))
#t))))))
;; Current 3.x version.
(define-public python-3 python-3.8)