Merge https://github.com/NixOS/nixpkgs

2 files changed, 29 insertions, 21 deletions

diff --git a/nixpkgs/pkgs/development/libraries/oneDNN/2.nix b/nixpkgs/pkgs/development/libraries/oneDNN/2.nix
index fd47a05a1bc9..8851b09214f1 100644
--- a/nixpkgs/pkgs/development/libraries/oneDNN/2.nix
+++ b/nixpkgs/pkgs/development/libraries/oneDNN/2.nix
@@ -1,17 +1,21 @@
-{ stdenv, lib, fetchFromGitHub, cmake }:
+{ 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 rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "oneDNN";
-  version = "2.7.1";
+  version = "2.7.5";
 
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "oneDNN";
-    rev = "v${version}";
-    sha256 = "sha256-HBCuSZkApd/6UkAxz/KDFb/gyX2SI1S2GwgXAXSTU/c=";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-oMPBORAdL2rk2ewyUrInYVHYBRvuvNX4p4rwykO3Rhs=";
   };
 
   outputs = [ "out" "dev" "doc" ];
@@ -30,12 +34,12 @@ stdenv.mkDerivation rec {
       --replace "\''${_IMPORT_PREFIX}/" ""
   '';
 
-  meta = with lib; {
+  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";
-    changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}";
-    license = licenses.asl20;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ alexarice bhipple ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ alexarice bhipple ];
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix
index f7495d3e9c8c..7448a99439d0 100644
--- a/nixpkgs/pkgs/development/libraries/oneDNN/default.nix
+++ b/nixpkgs/pkgs/development/libraries/oneDNN/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, lib, fetchFromGitHub, cmake }:
+{ 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 rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "oneDNN";
   version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "oneDNN";
-    rev = "v${version}";
-    sha256 = "sha256-/LbT2nHPpZHjY3xbJ9bDabR7aIMvetNP4mB+rxuTfy8=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-/LbT2nHPpZHjY3xbJ9bDabR7aIMvetNP4mB+rxuTfy8=";
   };
 
   outputs = [ "out" "dev" "doc" ];
@@ -30,12 +34,12 @@ stdenv.mkDerivation rec {
       --replace "\''${_IMPORT_PREFIX}/" ""
   '';
 
-  meta = with lib; {
+  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";
-    changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}";
-    license = licenses.asl20;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ bhipple ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ bhipple ];
+    platforms = lib.platforms.all;
   };
-}
+})