From ba8520ef16d00a8be29909437bed3aee6729b3ff Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 Nov 2024 22:32:31 +0100 Subject: [PATCH 1/2] python312Packages.uarray: unbreak, switch to new build system --- .../python-modules/uarray/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index a151ba1f1d80..b4233ea654eb 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -2,14 +2,17 @@ lib, buildPythonPackage, fetchFromGitHub, + scikit-build-core, setuptools, setuptools-scm, + cmake, + ninja, matchpy, numpy, astunparse, typing-extensions, - pytest7CheckHook, - pytest-cov, + pytestCheckHook, + pytest-cov-stub, }: buildPythonPackage rec { @@ -24,11 +27,15 @@ buildPythonPackage rec { hash = "sha256-q9lMU/xA+G2x38yZy3DxCpXTEmg1lZhZ8GFIHDIKE24="; }; - nativeBuildInputs = [ + build-system = [ + scikit-build-core setuptools setuptools-scm + cmake + ninja ]; - build-system = [ setuptools ]; + + dontUseCmakeConfigure = true; dependencies = [ astunparse @@ -38,8 +45,8 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest7CheckHook - pytest-cov + pytestCheckHook + pytest-cov-stub ]; # Tests must be run from outside the source directory From 1278531dfa9cb9c0afd4834d324a9da8b08fcfcf Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 8 Nov 2024 22:33:11 +0100 Subject: [PATCH 2/2] python312Packages.uarray: add pbsds to maintainers --- pkgs/development/python-modules/uarray/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index b4233ea654eb..777bfd3c6fb2 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -65,6 +65,6 @@ buildPythonPackage rec { description = "Universal array library"; homepage = "https://github.com/Quansight-Labs/uarray"; license = licenses.bsd0; - maintainers = [ ]; + maintainers = [ lib.maintainers.pbsds ]; }; }