From 2a2c873e6e8d5372ef8f284b1e82d711db31c93c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 1 Oct 2025 23:09:05 +0100 Subject: [PATCH] gnu: pythoncapi-compat: Move to python. * gnu/packages/python-xyz.scm (pythoncapi-compat): Move from here ... * gnu/packages/python.scm: ... to here. Change-Id: If3ac42200be381f9aafedbf0468e7381daaf2471 --- gnu/packages/python-xyz.scm | 26 -------------------------- gnu/packages/python.scm | 30 +++++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 27 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6588877120f..7664ff0cb7c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -40334,32 +40334,6 @@ based on Adobe XMP Toolkit, ensuring that future updates to the XMP standard are easily incorporated into the library with a minimum amount of work.") (license license:bsd-3))) -(define-public pythoncapi-compat - ;; No release nor tags: use the latest commit. - (let ((commit "b541b98df1e3e5aabb5def27422a75c876f5a88a") - (revision "0")) - (package - (name "pythoncapi-compat") - (version "0") - (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 - "09935gybfj2wqbf6jmn61m21qnx3za8xjv375n3daq8l3cs6dmmx")))) - (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 python-zarr (package (name "python-zarr") diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5fbf498ac2f..27378da3575 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -52,7 +52,7 @@ ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018 Clément Lassieur -;;; Copyright © 2018, 2019, 2020, 2021 Maxim Cournoyer +;;; Copyright © 2018, 2019, 2020, 2021, 2025 Maxim Cournoyer ;;; Copyright © 2018 Luther Thompson ;;; Copyright © 2018 Vagrant Cascadian ;;; Copyright © 2019, 2024 Tanguy Le Carrour @@ -96,10 +96,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) @@ -1596,6 +1598,32 @@ 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 "b541b98df1e3e5aabb5def27422a75c876f5a88a") + (revision "0")) + (package + (name "pythoncapi-compat") + (version "0") + (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 + "09935gybfj2wqbf6jmn61m21qnx3za8xjv375n3daq8l3cs6dmmx")))) + (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")