python312Packages.scikit-build: 0.17.6 -> 0.18.0

https://github.com/scikit-build/scikit-build/releases/tag/0.18.0

pkgs/development/python-modules/scikit-build/default.nix

@@ -24,27 +24,22 @@
 
 buildPythonPackage rec {
   pname = "scikit-build";
-  version = "0.17.6";
-  format = "pyproject";
+  version = "0.18.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     pname = "scikit_build";
     inherit version;
-    hash = "sha256-tRpRo2s3xCZQmUtQR5EvWbIuMhCyPjIfKHYR+e9uXJ0=";
+    hash = "sha256-caE69GfRo4UQw0lHhuLttz6tU+qSK95uUZ3FNyqmUJY=";
   };
 
   patches = [
-    # https://github.com/scikit-build/scikit-build/pull/1032
-    # https://github.com/scikit-build/scikit-build/issues/1047
-    ./python312-compatibility.patch
-
     (fetchpatch2 {
-      # https://github.com/scikit-build/scikit-build/pull/1073
-      name = "skbuild-suppress-permissionerror.patch";
-      url = "https://github.com/scikit-build/scikit-build/commit/41183413e4f5ef29cf3d21e470a2cfa2305733f8.patch";
-      hash = "sha256-M5Sbt4CBuiAeGgN0D/toglVi1V2GlA9hPIOMzcqOwdo=";
+      name = "setuptools-70.2.0-compat.patch";
+      url = "https://github.com/scikit-build/scikit-build/commit/7005897053bc5c71d823c36bbd89bd43121670f1.patch";
+      hash = "sha256-YGNCS1AXnqHQMd40CDePVNAzLe5gQ/nJxASAZafsxK8=";
     })
   ];
 
@@ -54,13 +49,13 @@ buildPythonPackage rec {
     sed -i "/'error',/d" pyproject.toml
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     hatch-fancy-pypi-readme
     hatch-vcs
     hatchling
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     distro
     packaging
     setuptools

pkgs/development/python-modules/scikit-build/python312-compatibility.patch

@@ -1,40 +0,0 @@
-diff --git a/skbuild/resources/cmake/FindPythonExtensions.cmake b/skbuild/resources/cmake/FindPythonExtensions.cmake
-index 59b30c2..62298d5 100644
---- a/skbuild/resources/cmake/FindPythonExtensions.cmake
-+++ b/skbuild/resources/cmake/FindPythonExtensions.cmake
-@@ -254,19 +254,23 @@ endif()
- include(targetLinkLibrariesWithDynamicLookup)
- 
- set(_command "
--import distutils.sysconfig
-+import sys
-+
-+if sys.version_info >= (3,10):
-+  import sysconfig
-+else:
-+  from distutils import sysconfig
- import itertools
- import os
- import os.path
- import site
--import sys
- 
- result = None
- rel_result = None
- candidate_lists = []
- 
- try:
--    candidate_lists.append((distutils.sysconfig.get_python_lib(),))
-+    candidate_lists.append((sysconfig.get_python_lib(),))
- except AttributeError: pass
- 
- try:
-@@ -293,7 +297,7 @@ sys.stdout.write(\";\".join((
-     sys.prefix,
-     result,
-     rel_result,
--    distutils.sysconfig.get_config_var('EXT_SUFFIX')
-+    sysconfig.get_config_var('EXT_SUFFIX')
- )))
- ")
-