From a91cf65a7e070d32792c2efc0012569cfc48e060 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Thu, 11 Aug 2022 19:36:05 +0200
Subject: 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.
---
 gnu/packages/python.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/python.scm')

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 8adcfaf199..2b0c6fdb8c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -421,11 +421,11 @@ (define-public python-2.7
 ;; Current 2.x version.
 (define-public python-2 python-2.7)
 
-(define-public python-3.9
+(define-public python-3.10
   (package
     (inherit python-2)
     (name "python")
-    (version "3.9.13")
+    (version "3.10.7")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.python.org/ftp/python/"
@@ -435,11 +435,10 @@ (define-public python-3.9
                         "python-3-deterministic-build-info.patch"
                         "python-3-fix-tests.patch"
                         "python-3-hurd-configure.patch"
-                        "python-3-search-paths.patch"
-                        "python-3-no-static-lib.patch"))
+                        "python-3-search-paths.patch"))
               (sha256
                (base32
-                "03q8lcb476a9n41nih9qvwf1fzfzjbvq6vj0cnmd458yixchqnqj"))
+                "0j6wvh2ad5jjq5n7sjmj1k66mh6lipabavchc3rb4vsinwaq9vbf"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -453,6 +452,8 @@ (define-public python-3.9
                             (find-files "Lib/distutils/command" "\\.exe$"))))))
     (arguments
      (substitute-keyword-arguments (package-arguments python-2)
+       ((#:configure-flags flags)
+        `(append ,flags '("--without-static-libpython")))
        ((#:make-flags _)
         `(list (string-append
                 (format #f "TESTOPTS=-j~d" (parallel-job-count))
@@ -577,7 +578,7 @@ (define-public python-3.9
             (files (list "share/zoneinfo")))))))
 
 ;; Current 3.x version.
-(define-public python-3 python-3.9)
+(define-public python-3 python-3.10)
 
 ;; Current major version.
 (define-public python python-3)
-- 
cgit v1.2.3