From 67e867c4e40687c8042c80ec1ffa1815b84b2b3d Mon Sep 17 00:00:00 2001 From: quantenzitrone Date: Sun, 8 Feb 2026 21:05:53 +0100 Subject: [PATCH] onednn: fix homepage and rename from oneDNN rename to lowercase to fit package naming conventions --- pkgs/by-name/ct/ctranslate2/package.nix | 4 ++-- pkgs/by-name/on/{oneDNN => onednn}/package.nix | 4 ++-- pkgs/by-name/on/{oneDNN_2 => onednn_2}/package.nix | 6 +++--- pkgs/development/python-modules/onnxruntime/default.nix | 4 ++-- pkgs/development/python-modules/vllm/default.nix | 6 +++--- pkgs/development/rocm-modules/migraphx/default.nix | 6 +++--- pkgs/top-level/aliases.nix | 2 ++ 7 files changed, 17 insertions(+), 15 deletions(-) rename pkgs/by-name/on/{oneDNN => onednn}/package.nix (94%) rename pkgs/by-name/on/{oneDNN_2 => onednn_2}/package.nix (91%) diff --git a/pkgs/by-name/ct/ctranslate2/package.nix b/pkgs/by-name/ct/ctranslate2/package.nix index 0af0627dc876..a0ab5976cbfa 100644 --- a/pkgs/by-name/ct/ctranslate2/package.nix +++ b/pkgs/by-name/ct/ctranslate2/package.nix @@ -13,7 +13,7 @@ # Enabling both withOneDNN and withOpenblas is broken # https://github.com/OpenNMT/CTranslate2/issues/1294 withOneDNN ? false, - oneDNN, + onednn, withOpenblas ? true, openblas, withRuy ? true, @@ -93,7 +93,7 @@ stdenv'.mkDerivation (finalAttrs: { cudaPackages.cudnn ] ++ lib.optionals withOneDNN [ - oneDNN + onednn ] ++ lib.optionals withOpenblas [ openblas diff --git a/pkgs/by-name/on/oneDNN/package.nix b/pkgs/by-name/on/onednn/package.nix similarity index 94% rename from pkgs/by-name/on/oneDNN/package.nix rename to pkgs/by-name/on/onednn/package.nix index 927f7e3fce22..297ca30b7747 100644 --- a/pkgs/by-name/on/oneDNN/package.nix +++ b/pkgs/by-name/on/onednn/package.nix @@ -10,7 +10,7 @@ # just recently been renamed again to oneDNN. See here for details: # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { - pname = "oneDNN"; + pname = "onednn"; version = "3.10.2"; src = fetchFromGitHub { @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${finalAttrs.version}"; description = "oneAPI Deep Neural Network Library (oneDNN)"; - homepage = "https://01.org/oneDNN"; + homepage = "http://uxlfoundation.github.io/oneDNN"; license = lib.licenses.asl20; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/on/oneDNN_2/package.nix b/pkgs/by-name/on/onednn_2/package.nix similarity index 91% rename from pkgs/by-name/on/oneDNN_2/package.nix rename to pkgs/by-name/on/onednn_2/package.nix index adbb3720c2f5..51a6fa36e2ee 100644 --- a/pkgs/by-name/on/oneDNN_2/package.nix +++ b/pkgs/by-name/on/onednn_2/package.nix @@ -8,10 +8,10 @@ # This was originally called mkl-dnn, then it was renamed to dnnl, and it has # just recently been renamed again to oneDNN. See here for details: # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn -# oneDNN_2 is currently only consumed by rocmPackages.migraphx and likely +# onednn_2 is currently only consumed by rocmPackages.migraphx and likely # to be dropped once migraphx can migrate to 3 stdenv.mkDerivation (finalAttrs: { - pname = "oneDNN"; + pname = "onednn"; version = "2.7.5"; src = fetchFromGitHub { @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${finalAttrs.version}"; description = "oneAPI Deep Neural Network Library (oneDNN)"; - homepage = "https://01.org/oneDNN"; + homepage = "http://uxlfoundation.github.io/oneDNN"; license = lib.licenses.asl20; teams = [ lib.teams.rocm ]; platforms = lib.platforms.all; diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix index 16ab351739db..6d52ed8ca512 100644 --- a/pkgs/development/python-modules/onnxruntime/default.nix +++ b/pkgs/development/python-modules/onnxruntime/default.nix @@ -6,7 +6,7 @@ autoPatchelfHook, # buildInputs - oneDNN, + onednn, re2, # dependencies @@ -53,7 +53,7 @@ buildPythonPackage { # Libraries are not linked correctly. buildInputs = [ - oneDNN + onednn re2 onnxruntime.protobuf diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 86b3c493f335..cf2cdd97b6ff 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -21,7 +21,7 @@ setuptools-scm, # buildInputs - oneDNN, + onednn, numactl, llvmPackages, @@ -392,7 +392,7 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: { buildInputs = lib.optionals cpuSupport [ - oneDNN + onednn ] ++ lib.optionals (cpuSupport && stdenv.hostPlatform.isLinux) [ numactl @@ -529,7 +529,7 @@ buildPythonPackage.override { stdenv = torch.stdenv; } (finalAttrs: { } // lib.optionalAttrs cpuSupport { VLLM_TARGET_DEVICE = "cpu"; - FETCHCONTENT_SOURCE_DIR_ONEDNN = "${oneDNN.src}"; + FETCHCONTENT_SOURCE_DIR_ONEDNN = "${onednn.src}"; }; preConfigure = '' diff --git a/pkgs/development/rocm-modules/migraphx/default.nix b/pkgs/development/rocm-modules/migraphx/default.nix index fa7bda79fc7b..cfbf3c0afde2 100644 --- a/pkgs/development/rocm-modules/migraphx/default.nix +++ b/pkgs/development/rocm-modules/migraphx/default.nix @@ -21,9 +21,9 @@ boost, msgpack-cxx, sqlite, - # TODO(@LunNova): Swap to `oneDNN` once v3 is supported + # TODO(@LunNova): Swap to `onednn` once v3 is supported # Upstream issue: https://github.com/ROCm/AMDMIGraphX/issues/4351 - oneDNN_2, + onednn_2, blaze, texliveSmall, doxygen, @@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { boost msgpack-cxx sqlite - oneDNN_2 + onednn_2 blaze python3Packages.pybind11 python3Packages.onnx diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 45239bd1f633..559584207126 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1390,6 +1390,8 @@ mapAliases { oclgrind = throw "oclgrind has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 oil = throw "'oil' has been renamed to/replaced by 'oils-for-unix'"; # Converted to throw 2025-10-27 olaris-server = throw "'olaris-server' has been removed as it failed to build since 2024"; # Added 2026-01-15 + oneDNN = onednn; # Added 2026-02-08 + oneDNN_2 = onednn_2; # Added 2026-02-08 onevpl-intel-gpu = throw "'onevpl-intel-gpu' has been renamed to/replaced by 'vpl-gpu-rt'"; # Converted to throw 2025-10-27 onlyoffice-bin = throw "'onlyoffice-bin' has been renamed to/replaced by 'onlyoffice-desktopeditors'"; # Converted to throw 2025-10-27 onlyoffice-bin_latest = throw "'onlyoffice-bin_latest' has been renamed to/replaced by 'onlyoffice-bin'"; # Converted to throw 2025-10-27