From bab9dabd64df4cfa2d96c1d2abfb05ff7431420a Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Wed, 22 Apr 2020 22:24:43 -0400
Subject: [PATCH] dnnl: rename to oneDNN to track upstream project rename

See the link in the default.nix file for details.  This adds an alias for
backwards compatibility.
---
 pkgs/development/libraries/{dnnl => oneDNN}/default.nix | 7 +++----
 pkgs/top-level/aliases.nix                              | 1 +
 pkgs/top-level/all-packages.nix                         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/development/libraries/{dnnl => oneDNN}/default.nix (83%)

diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/oneDNN/default.nix
similarity index 83%
rename from pkgs/development/libraries/dnnl/default.nix
rename to pkgs/development/libraries/oneDNN/default.nix
index 0d29c6eae8bf..7d9adca074c6 100644
--- a/pkgs/development/libraries/dnnl/default.nix
+++ b/pkgs/development/libraries/oneDNN/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, bash }:
+{ stdenv, lib, fetchFromGitHub, cmake }:
 
 # This was originally called mkl-dnn, then it was renamed to dnnl, and it has
-# just recently been renamed again to oneDNN. In a follow-up, let's move the
-# attr and alias dnnl -> oneDNN. See here for details:
+# 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 rec {
-  pname = "dnnl";
+  pname = "oneDNN";
   version = "1.4";
 
   src = fetchFromGitHub {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9ad282149aa6..3f5710d829c7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -98,6 +98,7 @@ mapAliases ({
   devicemapper = lvm2; # added 2018-04-25
   digikam5 = digikam; # added 2017-02-18
   dmtx = dmtx-utils; # added 2018-04-25
+  dnnl = oneDNN; # added 2020-04-22
   docbook5_xsl = docbook_xsl_ns; # added 2018-04-25
   docbook_xml_xslt = docbook_xsl; # added 2018-04-25
   double_conversion = double-conversion; # 2017-11-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61d537441a94..e1856ae68e27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11400,8 +11400,6 @@ in
 
   dhex = callPackage ../applications/editors/dhex { };
 
-  dnnl = callPackage ../development/libraries/dnnl { };
-
   double-conversion = callPackage ../development/libraries/double-conversion { };
 
   dclib = callPackage ../development/libraries/dclib { };
@@ -13761,6 +13759,8 @@ in
 
   one_gadget = callPackage ../development/tools/misc/one_gadget { };
 
+  oneDNN = callPackage ../development/libraries/oneDNN { };
+
   onedrive = callPackage ../applications/networking/sync/onedrive { };
 
   oneko = callPackage ../applications/misc/oneko { };