From dfe70a2d6347aa9a2bf2fa34124cc835c0d51c4b Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 18 Apr 2020 11:38:48 -0400
Subject: dnnl: 1.2.2 -> 1.4

The upstream readme has a note about renaming the git repo and libname:
https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn

Changelog: https://github.com/oneapi-src/oneDNN/releases/tag/v1.4
---
 pkgs/development/libraries/dnnl/bash-to-sh.patch | 13 -------------
 pkgs/development/libraries/dnnl/default.nix      | 24 +++++++++++-------------
 2 files changed, 11 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/development/libraries/dnnl/bash-to-sh.patch

diff --git a/pkgs/development/libraries/dnnl/bash-to-sh.patch b/pkgs/development/libraries/dnnl/bash-to-sh.patch
deleted file mode 100644
index 063d9ef952be..000000000000
--- a/pkgs/development/libraries/dnnl/bash-to-sh.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index f6810246..e1d2a1f1 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -72,7 +72,7 @@ if(UNIX OR MINGW)
-     set(test_c_symbols "${CMAKE_CURRENT_BINARY_DIR}/test_c_symbols.c")
-     add_custom_command(
-         OUTPUT ${test_c_symbols}
--        COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_c_symbols_refs.sh
-+        COMMAND @bash@/bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_c_symbols_refs.sh
-         ${CMAKE_CURRENT_SOURCE_DIR}/.. ${test_c_symbols} ${include_dirs}
-     )
-     register_exe(test_c_symbols-c ${test_c_symbols} "test")
diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/dnnl/default.nix
index 40d9030b9534..0d29c6eae8bf 100644
--- a/pkgs/development/libraries/dnnl/default.nix
+++ b/pkgs/development/libraries/dnnl/default.nix
@@ -1,23 +1,20 @@
 { stdenv, lib, fetchFromGitHub, substituteAll, cmake, bash }:
 
+# 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:
+# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
 stdenv.mkDerivation rec {
   pname = "dnnl";
-  version = "1.2.2";
+  version = "1.4";
 
   src = fetchFromGitHub {
-    owner = "intel";
-    repo = "mkl-dnn";
+    owner = "oneapi-src";
+    repo = "oneDNN";
     rev = "v${version}";
-    sha256 = "0ydy7ibm6sh1awrikyj938n26cpg5magnxraz2d0pj76irv4vj5m";
+    sha256 = "162fb0c7klahz2irchhyxympi4fq4yp284apc53cadbss41mzld9";
   };
 
-  # Generic fix merged upstream in https://github.com/intel/mkl-dnn/pull/631
-  # Delete after next release
-  patches = [ (substituteAll {
-    src = ./bash-to-sh.patch;
-    inherit bash;
-  }) ];
-
   outputs = [ "out" "dev" "doc" ];
 
   nativeBuildInputs = [ cmake ];
@@ -36,8 +33,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "Deep Neural Network Library (DNNL)";
-    homepage = "https://intel.github.io/mkl-dnn/dev_guide_transition_to_dnnl.html";
+    description = "oneAPI Deep Neural Network Library (oneDNN)";
+    homepage = "https://01.org/dnnl";
+    changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}";
     license = licenses.asl20;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ alexarice bhipple ];
-- 
cgit 1.4.1