From 49666df29621383f45f3138a52ab612e388deb54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 4 Jun 2026 05:31:45 +0200 Subject: [PATCH 1/2] onnxruntime: use latest abseil-cpp --- pkgs/by-name/on/onnxruntime/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index 3a04c92bf309..1d1bb925d72f 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -3,7 +3,7 @@ config, stdenv, fetchFromGitHub, - abseil-cpp_202508, + abseil-cpp, buildPackages, cmake, cpuinfo, @@ -275,7 +275,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ABSL_ENABLE_INSTALL" true) (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) (lib.cmakeBool "FETCHCONTENT_QUIET" false) - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp_202508.src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp.src}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DLPACK" "${dlpack-src}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_FLATBUFFERS" "${flatbuffers_23.src}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MP11" "${mp11-src}") From dd509002f831ac2fc63de4e78ac76be572642e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 4 Jun 2026 05:32:18 +0200 Subject: [PATCH 2/2] onnxruntime: simplify Nix expression ncclSupport is already guarded with cudaSupport --- pkgs/by-name/on/onnxruntime/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index 1d1bb925d72f..527597381ede 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -138,8 +138,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { substituteInPlace cmake/libonnxruntime.pc.cmake.in \ --replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_ echo "find_package(cudnn_frontend REQUIRED)" > cmake/external/cudnn_frontend.cmake - '' - + '' substituteInPlace onnxruntime/core/platform/posix/env.cc --replace-fail \ "return PathString{};" \ "return PathString(\"$out/lib/\");" @@ -289,7 +287,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.doCheck) (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf) (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport) - (lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport)) + (lib.cmakeBool "onnxruntime_USE_NCCL" ncclSupport) (lib.cmakeBool "onnxruntime_USE_MIGRAPHX" rocmSupport) (lib.cmakeBool "onnxruntime_USE_COREML" coremlSupport) (lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8"))