From 4bd6db2080267dc4dbf254db09be3c1216b6fafc Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Wed, 31 Dec 2025 10:42:17 +0100 Subject: [PATCH] gnu: python-six: Move to (gnu packages python-build). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-six, python-six-bootstrap): Move from here… * gnu/packages/python-build.scm (python-six, python-six-bootstrap): …to here. * gnu/packages/linphone.scm: Adapt imported modules. * gnu/packages/mate.scm: Adapt imported modules. Change-Id: Iea0b78aa4adfdd68d863f674fd37997ad4c99485 Signed-off-by: Sharlatan Hellseher --- gnu/packages/linphone.scm | 1 + gnu/packages/mate.scm | 1 + gnu/packages/python-build.scm | 26 ++++++++++++++++++++++++++ gnu/packages/python-xyz.scm | 27 --------------------------- 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index f1987b276e..9efdc1c500 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -44,6 +44,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages serialization) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 0b493fc17c..c376a1361d 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -71,6 +71,7 @@ #:use-module (gnu packages polkit) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages tex) #:use-module (gnu packages webkit) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 86e48d34a3..68977c61da 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -908,6 +908,32 @@ them as the version argument or in a SCM managed file.") (sha256 (base32 "0mzgyyg1cgigkmlfm0iy44f2092zn8xc093ygn4a11jncss4lrqw")))))) +(define-public python-six + (package + (name "python-six") + (version "1.17.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "six" version)) + (sha256 + (base32 "109ajcsfhrz33lbwbb337w34crc3lb9rjnxrcpnbczlf8rfk6w7z")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest-bootstrap + python-setuptools)) + (home-page "https://pypi.org/project/six/") + (synopsis "Python 2 and 3 compatibility utilities") + (description + "Six is a Python 2 and 3 compatibility library. It provides utility +functions for smoothing over the differences between the Python versions with +the goal of writing Python code that is compatible on both Python versions. +Six supports every Python version since 2.5. It is contained in only one +Python file, so it can be easily copied into your project.") + (license license:x11))) + +(define-public python-six-bootstrap python-six) + (define-public python-editables (package (name "python-editables") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5ba0228786..c54e5c09b7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6868,33 +6868,6 @@ standard.") in the current session, Python, and the OS.") (license license:bsd-3))) -(define-public python-six - (package - (name "python-six") - (version "1.17.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "six" version)) - (sha256 - (base32 "109ajcsfhrz33lbwbb337w34crc3lb9rjnxrcpnbczlf8rfk6w7z")))) - (build-system pyproject-build-system) - (native-inputs - (list python-pytest-bootstrap - python-setuptools - python-wheel)) - (home-page "https://pypi.org/project/six/") - (synopsis "Python 2 and 3 compatibility utilities") - (description - "Six is a Python 2 and 3 compatibility library. It provides utility -functions for smoothing over the differences between the Python versions with -the goal of writing Python code that is compatible on both Python versions. -Six supports every Python version since 2.5. It is contained in only one -Python file, so it can be easily copied into your project.") - (license license:x11))) - -(define-public python-six-bootstrap python-six) - (define-public python-schedule (package (name "python-schedule")