From bfae1bafcac9e8840c0b735a3ad7dd44b0797b3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 14 Jun 2025 16:28:04 -0700
Subject: [PATCH 1/2] rocmPackages.migraphx: override oneDNN

---
 .../development/rocm-modules/6/migraphx/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/migraphx/default.nix b/pkgs/development/rocm-modules/6/migraphx/default.nix
index 5501e6044b615..54620d320076c 100644
--- a/pkgs/development/rocm-modules/6/migraphx/default.nix
+++ b/pkgs/development/rocm-modules/6/migraphx/default.nix
@@ -20,7 +20,7 @@
   nlohmann_json,
   msgpack,
   sqlite,
-  oneDNN_2,
+  oneDNN,
   blaze,
   texliveSmall,
   doxygen,
@@ -51,6 +51,15 @@ let
       ]
     )
   );
+  oneDNN' = oneDNN.overrideAttrs rec {
+    version = "2.7.5";
+    src = fetchFromGitHub {
+      owner = "oneapi-src";
+      repo = "oneDNN";
+      tag = "v${version}";
+      hash = "sha256-oMPBORAdL2rk2ewyUrInYVHYBRvuvNX4p4rwykO3Rhs=";
+    };
+  };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "migraphx";
@@ -105,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
     nlohmann_json
     msgpack
     sqlite
-    oneDNN_2
+    oneDNN'
     blaze
     python3Packages.pybind11
     python3Packages.onnx

From f596809779fa6d31ff24909d743ddfc8a3675cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 14 Jun 2025 16:28:53 -0700
Subject: [PATCH 2/2] oneDNN_2: drop

---
 pkgs/by-name/on/oneDNN_2/package.nix | 53 ----------------------------
 pkgs/top-level/aliases.nix           |  1 +
 2 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 pkgs/by-name/on/oneDNN_2/package.nix

diff --git a/pkgs/by-name/on/oneDNN_2/package.nix b/pkgs/by-name/on/oneDNN_2/package.nix
deleted file mode 100644
index 5bd3c88a75eab..0000000000000
--- a/pkgs/by-name/on/oneDNN_2/package.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  cmake,
-  fetchFromGitHub,
-  lib,
-  stdenv,
-}:
-
-# 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
-stdenv.mkDerivation (finalAttrs: {
-  pname = "oneDNN";
-  version = "2.7.5";
-
-  src = fetchFromGitHub {
-    owner = "oneapi-src";
-    repo = "oneDNN";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-oMPBORAdL2rk2ewyUrInYVHYBRvuvNX4p4rwykO3Rhs=";
-  };
-
-  outputs = [
-    "out"
-    "dev"
-    "doc"
-  ];
-
-  nativeBuildInputs = [ cmake ];
-
-  # Tests fail on some Hydra builders, because they do not support SSE4.2.
-  doCheck = false;
-
-  # Fixup bad cmake paths
-  postInstall = ''
-    substituteInPlace $out/lib/cmake/dnnl/dnnl-config.cmake \
-      --replace "\''${PACKAGE_PREFIX_DIR}/" ""
-
-    substituteInPlace $out/lib/cmake/dnnl/dnnl-targets.cmake \
-      --replace "\''${_IMPORT_PREFIX}/" ""
-  '';
-
-  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";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
-      alexarice
-      bhipple
-    ];
-    platforms = lib.platforms.all;
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9473f94ffcda7..0935f37650c23 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1412,6 +1412,7 @@ mapAliases {
   odoo15 = throw "odoo15 has been removed from nixpkgs as it is unsupported; migrate to a newer version of odoo"; # Added 2025-05-06
   offrss = throw "offrss has been removed due to lack of upstream maintenance; consider using another rss reader"; # Added 2025-06-01
   oil = lib.warnOnInstantiate "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22
+  oneDNN_2 = throw "oneDNN_2 has been removed as it was only used by rocmPackages.migraphx"; # added 2025-07-18
   onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
   openai-whisper-cpp = whisper-cpp; # Added 2024-12-13
   opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20