From 8adf1b68318a8a8bf24116a83b8a93eaba009814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 15 Oct 2024 15:02:56 -0700 Subject: [PATCH] python312Packages.onnx: clean up dependencies --- .../python-modules/onnx/default.nix | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index f8bdd75368a1..a79342af3428 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -18,6 +18,7 @@ google-re2, pillow, protobuf, + setuptools, }: let @@ -26,45 +27,52 @@ in buildPythonPackage rec { pname = "onnx"; version = "1.16.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "onnx"; + repo = "onnx"; rev = "refs/tags/v${version}"; hash = "sha256-JmxnsHRrzj2QzPz3Yndw0MmgZJ8MDYxHjuQ7PQkQsDg="; }; build-system = [ cmake - pybind11 + protobuf + setuptools + ]; + + nativeBuildInputs = [ + protobuf_21 # for protoc ]; buildInputs = [ abseil-cpp - protobuf - google-re2 + protobuf_21 gtestStatic - pillow + pybind11 ]; dependencies = [ - protobuf_21 protobuf numpy typing-extensions ]; nativeCheckInputs = [ + google-re2 nbval parameterized + pillow pytestCheckHook tabulate ]; postPatch = '' + rm -r third_party + chmod +x tools/protoc-gen-mypy.sh.in patchShebangs tools/protoc-gen-mypy.sh.in