From d1380ab059dcf86944d95ab8dcdd1805ea7f12bc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 31 Oct 2024 11:41:02 +0100 Subject: [PATCH] python312Packages.onnxconverter-common: use python package for protobuf --- .../python-modules/onnxconverter-common/default.nix | 11 +++++++++-- pkgs/top-level/python-packages.nix | 4 +--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/onnxconverter-common/default.nix b/pkgs/development/python-modules/onnxconverter-common/default.nix index 94cc0b881351..87d83797fbfd 100644 --- a/pkgs/development/python-modules/onnxconverter-common/default.nix +++ b/pkgs/development/python-modules/onnxconverter-common/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, numpy, packaging, protobuf, @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "onnxconverter-common"; version = "1.14.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "microsoft"; @@ -23,7 +24,13 @@ buildPythonPackage rec { hash = "sha256-NbHyjLcr/Gq1zRiJW3ZBpEVQGVQGhp7SmfVd5hBIi2o="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ "protobuf" ]; + + dependencies = [ numpy packaging protobuf diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c273612e2ec3..d58a319e95ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9340,9 +9340,7 @@ self: super: with self; { onnx = callPackage ../development/python-modules/onnx { }; - onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { - inherit (pkgs) protobuf; - }; + onnxconverter-common = callPackage ../development/python-modules/onnxconverter-common { }; onnxmltools = callPackage ../development/python-modules/onnxmltools { };