From 74725fa54aae5b0fd15c007707a6c996d16394ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 18 Nov 2024 14:22:28 -0800 Subject: [PATCH] python312Packages.distutils: unbreak on Darwin --- .../python-modules/distutils/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/distutils/default.nix b/pkgs/development/python-modules/distutils/default.nix index 64c721824bb9..f0264209b887 100644 --- a/pkgs/development/python-modules/distutils/default.nix +++ b/pkgs/development/python-modules/distutils/default.nix @@ -5,15 +5,18 @@ setuptools-scm, setuptools, python, + docutils, jaraco-collections, jaraco-functools, jaraco-envs, jaraco-path, jaraco-text, more-itertools, + packaging, path, pyfakefs, pytestCheckHook, + stdenv, }: buildPythonPackage rec { @@ -24,13 +27,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pypa"; repo = "distutils"; - rev = "378984e02edae91d5f49425da8436f8dd9152b8a"; # correlate commit from setuptools version - hash = "sha256-31sPPVY6tr+OwpiFiaKw82KyhDNBVW3Foea49dCa6pA="; + rev = "72837514c2b67081401db556be9aaaa43debe44f"; # correlate commit from setuptools version + hash = "sha256-Kx4Iudy9oZ0oQT96Meyq/m0k0BuexPLVxwvpNJehCW0="; }; build-system = [ setuptools-scm ]; - dependencies = [ jaraco-functools ]; + dependencies = [ + jaraco-collections + jaraco-functools + more-itertools + packaging + ]; postInstall = '' rm -r $out/${python.sitePackages}/distutils @@ -40,7 +48,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "distutils" ]; nativeCheckInputs = [ - jaraco-collections + docutils jaraco-envs jaraco-path jaraco-text @@ -50,6 +58,9 @@ buildPythonPackage rec { pytestCheckHook ]; + # jaraco-path depends ob pyobjc + doCheck = !stdenv.isDarwin; + meta = { description = "Distutils as found in cpython"; homepage = "https://github.com/pypa/distutils";