diff options
Diffstat (limited to 'gnu/packages/python.scm')
| -rw-r--r-- | gnu/packages/python.scm | 61 |
1 files changed, 41 insertions, 20 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b55488b1f5..72c1b34734 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2015, 2016 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org> ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org> -;;; Copyright © 2016, 2018 Hartmut Goebel <h.goebel@crazy-compilers.com> +;;; Copyright © 2016, 2018, 2025 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Daniel Pimentel <d4n1@d4n1.org> ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2016, 2017 Troy Sankey <sankeytms@gmail.com> @@ -52,7 +52,7 @@ ;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> -;;; Copyright © 2018, 2019, 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2018, 2019, 2020, 2021, 2025 Maxim Cournoyer <maxim@guixotic.coop> ;;; Copyright © 2018 Luther Thompson <lutheroto@gmail.com> ;;; Copyright © 2018 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2019, 2024 Tanguy Le Carrour <tanguy@bioneland.org> @@ -61,6 +61,8 @@ ;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com> ;;; Copyright © 2022 jgart <jgart@dismail.de> ;;; Copyright © 2021 Lars-Dominik Braun <lars@6xq.net> +;;; Copyright © 2025 Hugo Buddelmeijer <hugo@buddelmeijer.nl> +;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -95,10 +97,12 @@ #:use-module (gnu packages tls) #:use-module (gnu packages xml) #:use-module (guix gexp) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix search-paths) #:use-module (guix utils) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (srfi srfi-1) @@ -448,7 +452,8 @@ introspection capabilities; intuitive object orientation; natural expression of procedural code; full modularity, supporting hierarchical packages; exception-based error handling; and very high level dynamic data types.") - (properties '((cpe-name . "python"))) + (properties '((cpe-name . "python") + (cpe-vendor . "python"))) (license license:psfl))) ;; Current 2.x version. @@ -1078,14 +1083,14 @@ def contents() -> str: (define-public python-3.12 (package (name "python-next") - (version "3.12.11") + (version "3.12.12") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) (sha256 - (base32 "1nvskza80hzzh0x3w6i79jxkkrvl9x1ld9am3fqik6hygx5v42y3")) + (base32 "1i2nqvnm2b7aakj2rf8qdfsk0nh55ly55gcbl6dw8a5h2hsa31gv")) (patches (search-patches "python-3-deterministic-build-info.patch" "python-3.12-fix-tests.patch" "python-3-hurd-configure.patch")) @@ -1464,7 +1469,8 @@ introspection capabilities; intuitive object orientation; natural expression of procedural code; full modularity, supporting hierarchical packages; exception-based error handling; and very high level dynamic data types.") - (properties '((cpe-name . "python"))) + (properties '((cpe-name . "python") + (cpe-vendor . "python"))) (license license:psfl))) ;; Next 3.x version. @@ -1476,20 +1482,9 @@ data types.") ;; Current major version. (define-public python python-3) -;; Minimal variants of Python, mostly used to break the cycle between Tk and +;; Minimal variant of Python, mostly used to break the cycle between Tk and ;; Python (Tk -> libxcb -> Python.) -(define-public python2-minimal - (package/inherit python-2 - (name "python2-minimal") - (outputs '("out")) - - ;; Keep zlib, which is used by 'pip' (via the 'zipimport' module), which - ;; 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 (list expat libffi zlib)))) - (define-public python-minimal (package/inherit python (name "python-minimal") @@ -1604,10 +1599,36 @@ and the unversioned commands available."))) Use this package if you need a minimal Python toolchain instead of just the interpreter.")))) +(define-public pythoncapi-compat + ;; No release nor tags: use the latest commit. + (let ((commit "ab72af8b1a9adfccb3578eea8e9b6d5c6449f409") + (revision "1")) + (package + (name "pythoncapi-compat") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/python/pythoncapi-compat") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dfzfs399ik10125kvs5s8rid93lm50wray8s7b8bv90a61zjxiv")))) + (build-system copy-build-system) + (arguments (list #:install-plan + #~'(("pythoncapi_compat.h" "include/")))) + (home-page "https://github.com/python/pythoncapi-compat") + (synopsis "Python C API compatibility") + (description "The pythoncapi-compat project can be used to write a C or +C++ extension supporting a wide range of Python versions with a single code +base, via the @file{pythoncapi_compat.h} header file.") + (license license:bsd-0)))) + (define-public micropython (package (name "micropython") - (version "1.19") + (version "1.26.1") (source (origin (method url-fetch) @@ -1615,7 +1636,7 @@ the interpreter.")))) "releases/download/v" version "/micropython-" version ".tar.xz")) (sha256 - (base32 "090bbls5vnicynjyjqqd5zqwx8d6zxp7wlnrxgh0b4s8cyf5i8zj")) + (base32 "165c8g60f5zf82gw2d94snyjmcgn999jn4i8ngyc0wk2vwa6bghj")) (modules '((guix build utils))) (snippet '(begin |