From 53158decf52c80c17d3dc2b978bae3c9d9a6cdb6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 23 Aug 2024 14:43:23 +0200
Subject: [PATCH] python312Packages.scikit-build-core: 0.9.6 -> 0.10.5

https://github.com/scikit-build/scikit-build-core/releases/tag/v0.9.7
https://github.com/scikit-build/scikit-build-core/releases/tag/v0.9.8
https://github.com/scikit-build/scikit-build-core/releases/tag/v0.9.9
https://github.com/scikit-build/scikit-build-core/releases/tag/v0.9.10
https://github.com/scikit-build/scikit-build-core/releases/tag/v0.10.0
https://github.com/scikit-build/scikit-build-core/releases/tag/v0.10.1
https://github.com/scikit-build/scikit-build-core/releases/tag/v0.10.2
https://github.com/scikit-build/scikit-build-core/releases/tag/v0.10.3
https://github.com/scikit-build/scikit-build-core/releases/tag/v0.10.4
https://github.com/scikit-build/scikit-build-core/releases/tag/v0.10.5
---
 .../python-modules/awkward-cpp/default.nix    |  2 +-
 .../python-modules/iminuit/default.nix        |  2 +-
 .../python-modules/laszip/default.nix         |  2 +-
 .../scikit-build-core/default.nix             | 67 ++++++++++---------
 4 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix
index eac1d662bb69..b6ff257f71d1 100644
--- a/pkgs/development/python-modules/awkward-cpp/default.nix
+++ b/pkgs/development/python-modules/awkward-cpp/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     ninja
     pybind11
     scikit-build-core
-  ] ++ scikit-build-core.optional-dependencies.pyproject;
+  ];
 
   dependencies = [ numpy ];
 
diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix
index 0234210689c0..477e6f06a124 100644
--- a/pkgs/development/python-modules/iminuit/default.nix
+++ b/pkgs/development/python-modules/iminuit/default.nix
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     pathspec
     ninja
     pyproject-metadata
-  ] ++ scikit-build-core.optional-dependencies.pyproject;
+  ];
 
   propagatedBuildInputs = [ numpy ];
 
diff --git a/pkgs/development/python-modules/laszip/default.nix b/pkgs/development/python-modules/laszip/default.nix
index 97c268d956ba..461102cc69db 100644
--- a/pkgs/development/python-modules/laszip/default.nix
+++ b/pkgs/development/python-modules/laszip/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     ninja
     pybind11
     scikit-build-core
-  ] ++ scikit-build-core.optional-dependencies.pyproject;
+  ];
 
   dontUseCmakeConfigure = true;
 
diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix
index f9081c6265c4..3dafa8134d0f 100644
--- a/pkgs/development/python-modules/scikit-build-core/default.nix
+++ b/pkgs/development/python-modules/scikit-build-core/default.nix
@@ -1,18 +1,25 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  distlib,
+  fetchFromGitHub,
   pythonOlder,
-  exceptiongroup,
+
+  # build-system
   hatch-vcs,
   hatchling,
-  cattrs,
   cmake,
   ninja,
+
+  # dependencies
   packaging,
   pathspec,
-  pyproject-metadata,
+  exceptiongroup,
+
+  # tests
+  build,
+  cattrs,
+  numpy,
+  pybind11,
   pytest-subprocess,
   pytestCheckHook,
   setuptools,
@@ -23,62 +30,56 @@
 
 buildPythonPackage rec {
   pname = "scikit-build-core";
-  version = "0.9.6";
+  version = "0.10.5";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "scikit_build_core";
-    inherit version;
-    hash = "sha256-e+r5M89zSsvrttlsApNlQQIkcJvN5o87C08MsD4FSTk=";
+  src = fetchFromGitHub {
+    owner = "scikit-build";
+    repo = "scikit-build-core";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-hpwXEWPofgMT4ua2tZI1mtGbaBkT2XPBd6QL8xTi1A0=";
   };
 
   postPatch = lib.optionalString (pythonOlder "3.11") ''
     substituteInPlace pyproject.toml \
-      --replace '"error",' '"error", "ignore::UserWarning",'
+      --replace-fail '"error",' '"error", "ignore::UserWarning",'
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     hatch-vcs
     hatchling
   ];
 
-  propagatedBuildInputs =
-    [ packaging ]
+  dependencies =
+    [
+      packaging
+      pathspec
+    ]
     ++ lib.optionals (pythonOlder "3.11") [
       exceptiongroup
       tomli
     ];
 
-  passthru.optional-dependencies = {
-    pyproject = [
-      distlib
-      pathspec
-      pyproject-metadata
-    ];
-  };
-
-  dontUseCmakeConfigure = true;
-
   nativeCheckInputs = [
+    build
     cattrs
     cmake
     ninja
+    numpy
+    pybind11
     pytest-subprocess
     pytestCheckHook
     setuptools
     virtualenv
     wheel
-  ] ++ passthru.optional-dependencies.pyproject;
+  ];
+
+  # cmake is only used for tests
+  dontUseCmakeConfigure = true;
+
+  pytestFlagsArray = [ "-m 'not isolated and not network'" ];
 
   disabledTestPaths = [
-    # runs pip, requires network access
-    "tests/test_custom_modules.py"
-    "tests/test_hatchling.py"
-    "tests/test_pyproject_pep517.py"
-    "tests/test_pyproject_pep518.py"
-    "tests/test_pyproject_pep660.py"
-    "tests/test_setuptools_pep517.py"
-    "tests/test_setuptools_pep518.py"
     # store permissions issue in Nix:
     "tests/test_editable.py"
   ];