From aa5693fc1933a4452ba04efd68373996aca43483 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 27 Aug 2025 00:13:59 +0200
Subject: [PATCH] onnxruntime: 1.22.0 -> 1.22.2

Diff: https://github.com/microsoft/onnxruntime/compare/v1.22.0...v1.22.2

Changelog: https://github.com/microsoft/onnxruntime/releases/tag/v1.22.2
---
 pkgs/by-name/on/onnxruntime/package.nix         | 17 ++++++-----------
 .../python-modules/onnxruntime/default.nix      | 13 ++++++++-----
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix
index adf858797a23..e6c0ee78a57f 100644
--- a/pkgs/by-name/on/onnxruntime/package.nix
+++ b/pkgs/by-name/on/onnxruntime/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   abseil-cpp_202407,
   cmake,
   cpuinfo,
@@ -20,8 +19,7 @@
   re2,
   zlib,
   microsoft-gsl,
-  libiconv,
-  protobuf_21,
+  protobuf,
   pythonSupport ? true,
   cudaSupport ? config.cudaSupport,
   ncclSupport ? config.cudaSupport,
@@ -29,14 +27,14 @@
 }@inputs:
 
 let
-  version = "1.22.0";
+  version = "1.22.2";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "onnxruntime";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-fcTvMsEgO3tHOvCKCAqkO/bpZX4tcJHq9ZqpZH+uMqs=";
+    hash = "sha256-X8Pdtc0eR0iU+Xi2A1HrNo1xqCnoaxNjj4QFm/E3kSE=";
   };
 
   stdenv = throw "Use effectiveStdenv instead";
@@ -114,7 +112,7 @@ effectiveStdenv.mkDerivation rec {
     cmake
     pkg-config
     python3Packages.python
-    protobuf_21
+    protobuf
   ]
   ++ lib.optionals pythonSupport (
     with python3Packages;
@@ -155,9 +153,6 @@ effectiveStdenv.mkDerivation rec {
       packaging
     ]
   )
-  ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
-    libiconv
-  ]
   ++ lib.optionals cudaSupport (
     with cudaPackages;
     [
@@ -214,7 +209,7 @@ effectiveStdenv.mkDerivation rec {
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SAFEINT" "${safeint}")
     (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS")
     # fails to find protoc on darwin, so specify it
-    (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" "${protobuf_21}/bin/protoc")
+    (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe protobuf))
     (lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true)
     (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" doCheck)
     (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" false)
@@ -283,7 +278,7 @@ effectiveStdenv.mkDerivation rec {
 
   passthru = {
     inherit cudaSupport cudaPackages; # for the python module
-    protobuf = protobuf_21;
+    inherit protobuf;
     tests = lib.optionalAttrs pythonSupport {
       python = python3Packages.onnxruntime;
     };
diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix
index 6848b811518f..d8bdbe5c240b 100644
--- a/pkgs/development/python-modules/onnxruntime/default.nix
+++ b/pkgs/development/python-modules/onnxruntime/default.nix
@@ -2,14 +2,17 @@
   lib,
   stdenv,
   buildPythonPackage,
-  autoPatchelfHook,
   onnxruntime,
-  coloredlogs,
-  numpy,
-  packaging,
+  autoPatchelfHook,
+
+  # buildInputs
   oneDNN,
   re2,
 
+  # dependencies
+  coloredlogs,
+  numpy,
+  packaging,
 }:
 
 # onnxruntime requires an older protobuf.
@@ -69,7 +72,7 @@ buildPythonPackage {
     ]
   );
 
-  propagatedBuildInputs = [
+  dependencies = [
     coloredlogs
     # flatbuffers
     numpy