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 0d29c6eae8b..7d9adca074c 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 66a2e36fa15..cacaa16a935 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -100,6 +100,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 bcc5bd1e5d8..a0c885e705a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11411,8 +11411,6 @@ in dhex = callPackage ../applications/editors/dhex { }; - dnnl = callPackage ../development/libraries/dnnl { }; - double-conversion = callPackage ../development/libraries/double-conversion { }; dclib = callPackage ../development/libraries/dclib { }; @@ -13772,6 +13770,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 { };