summaryrefslogtreecommitdiff
path: root/gnu/packages/python.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-08-11 19:36:05 +0200
committerMarius Bakke <marius@gnu.org>2022-09-18 17:06:05 +0200
commita91cf65a7e070d32792c2efc0012569cfc48e060 (patch)
treefd40c0fa4fba42744eda76c5d31a7251c521575d /gnu/packages/python.scm
parent3d3100d8b1df073e26cc42d20726711b0873d9b1 (diff)
gnu: Python: Update to 3.10.7.
* gnu/packages/python.scm (python-3.9): Rename to ... (python-3.10): ... this. Update to 3.10.7. [source](patches): Remove 'python-3-no-static-libs.patch' in favor of ... [arguments]: Add #:configure-flags. (python-3): Refer to PYTHON-3.10. * gnu/packages/patches/python-3-fix-tests.patch: Refresh. * gnu/packages/patches/python-3-no-static-lib.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/version-control.scm (mercurial)[native-search-paths]: Adjust Python version. * gnu/packages/admin.scm (ansible)[native-search-paths]: Likewise. * gnu/packages/bioinformatics.scm (scvelo)[arguments]: Replace hard-coded python3.9 paths with python3.10. * gnu/packages/cran.scm (r-torch)[arguments]: Likewise. * gnu/packages/machine-learning.scm (liblantern)[arguments]: Likewise.
Diffstat (limited to 'gnu/packages/python.scm')
-rw-r--r--gnu/packages/python.scm13
1 files changed, 7 insertions, 6 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 8adcfaf199e..2b0c6fdb8ca 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -421,11 +421,11 @@ data types.")
421;; Current 2.x version. 421;; Current 2.x version.
422(define-public python-2 python-2.7) 422(define-public python-2 python-2.7)
423 423
424(define-public python-3.9 424(define-public python-3.10
425 (package 425 (package
426 (inherit python-2) 426 (inherit python-2)
427 (name "python") 427 (name "python")
428 (version "3.9.13") 428 (version "3.10.7")
429 (source (origin 429 (source (origin
430 (method url-fetch) 430 (method url-fetch)
431 (uri (string-append "https://www.python.org/ftp/python/" 431 (uri (string-append "https://www.python.org/ftp/python/"
@@ -435,11 +435,10 @@ data types.")
435 "python-3-deterministic-build-info.patch" 435 "python-3-deterministic-build-info.patch"
436 "python-3-fix-tests.patch" 436 "python-3-fix-tests.patch"
437 "python-3-hurd-configure.patch" 437 "python-3-hurd-configure.patch"
438 "python-3-search-paths.patch" 438 "python-3-search-paths.patch"))
439 "python-3-no-static-lib.patch"))
440 (sha256 439 (sha256
441 (base32 440 (base32
442 "03q8lcb476a9n41nih9qvwf1fzfzjbvq6vj0cnmd458yixchqnqj")) 441 "0j6wvh2ad5jjq5n7sjmj1k66mh6lipabavchc3rb4vsinwaq9vbf"))
443 (modules '((guix build utils))) 442 (modules '((guix build utils)))
444 (snippet 443 (snippet
445 '(begin 444 '(begin
@@ -453,6 +452,8 @@ data types.")
453 (find-files "Lib/distutils/command" "\\.exe$")))))) 452 (find-files "Lib/distutils/command" "\\.exe$"))))))
454 (arguments 453 (arguments
455 (substitute-keyword-arguments (package-arguments python-2) 454 (substitute-keyword-arguments (package-arguments python-2)
455 ((#:configure-flags flags)
456 `(append ,flags '("--without-static-libpython")))
456 ((#:make-flags _) 457 ((#:make-flags _)
457 `(list (string-append 458 `(list (string-append
458 (format #f "TESTOPTS=-j~d" (parallel-job-count)) 459 (format #f "TESTOPTS=-j~d" (parallel-job-count))
@@ -577,7 +578,7 @@ data types.")
577 (files (list "share/zoneinfo"))))))) 578 (files (list "share/zoneinfo")))))))
578 579
579;; Current 3.x version. 580;; Current 3.x version.
580(define-public python-3 python-3.9) 581(define-public python-3 python-3.10)
581 582
582;; Current major version. 583;; Current major version.
583(define-public python python-3) 584(define-public python python-3)