From 3d229753d66bd46ca0cf307f72786daa520dc5ff Mon Sep 17 00:00:00 2001
From: Markus Theil <theil.markus@gmail.com>
Date: Thu, 13 Feb 2025 09:00:48 +0100
Subject: [PATCH] mstflint_access: 4.30.0-1 -> 4.31.0-1; mstflint: 4.30.0-1 ->
 4.31.0-1

Contains many fixes for mlxfwreset on Bluefields.

Signed-off-by: Markus Theil <theil.markus@gmail.com>
---
 pkgs/by-name/ms/mstflint/package.nix               | 13 +++++++++++--
 pkgs/os-specific/linux/mstflint_access/default.nix |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ms/mstflint/package.nix b/pkgs/by-name/ms/mstflint/package.nix
index 94b752e662d5..d1b05fed31cd 100644
--- a/pkgs/by-name/ms/mstflint/package.nix
+++ b/pkgs/by-name/ms/mstflint/package.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchurl
+, fetchpatch
 , rdma-core
 , openssl
 , zlib
@@ -27,13 +28,21 @@ stdenv.mkDerivation rec {
   pname = "mstflint";
 
   # if you update the version of this package, also update the input hash in mstflint_access!
-  version = "4.30.0-1";
+  version = "4.31.0-1";
 
   src = fetchurl {
     url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/mstflint-${version}.tar.gz";
-    hash = "sha256-8v0aeVy1ZGbzNdL71V1qm6sgEy0e3eb2F1DP8L3m2ns=";
+    hash = "sha256-wBUkFOdYChiSXHcH6+LLZZ06Hte4ABWjW+pNcjtk+Oc=";
   };
 
+  patches = [
+    # fixes build errors due to missing declarations in headers
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/Mellanox/mstflint/pull/1131.patch";
+      sha256 = "sha256-tn8EO9HkDrMroV6byUPgjclBIK8tq4xGyi4Kx/rIj+w=";
+    })
+  ];
+
   nativeBuildInputs = [
     autoconf
     automake
diff --git a/pkgs/os-specific/linux/mstflint_access/default.nix b/pkgs/os-specific/linux/mstflint_access/default.nix
index 75ad6034fbd9..c2b22feb99ba 100644
--- a/pkgs/os-specific/linux/mstflint_access/default.nix
+++ b/pkgs/os-specific/linux/mstflint_access/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/kernel-mstflint-${version}.tar.gz";
-    hash = "sha256-DfXaU31itartFgTeCtWNZrskjUqc1a62dRO/gTfgCHk=";
+    hash = "sha256-kQBv/67miw6lSHIcCVYy66B7OHVofFs2N+evtsQ3Ovk=";
   };
 
   nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;