From 5afac852f362f037374d59942575c79f8d777595 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Mon, 7 Jul 2025 09:19:06 +0200 Subject: [PATCH 1/5] rshim-user-space: 2.2.4 -> 2.4.2 From upstream changelog: * Update bfb-tool - support NIC FW replacing * Reduce CPU usage by polling optimization * bfb-install: Support trimmed NIC_FW * bfdump support * Use BREADCRUMB.BIT32 to indicate NIC mode * Added bfb-tool script Signed-off-by: Markus Theil --- pkgs/by-name/rs/rshim-user-space/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rs/rshim-user-space/package.nix b/pkgs/by-name/rs/rshim-user-space/package.nix index 347958bd6d04..e7ae7f02e0c8 100644 --- a/pkgs/by-name/rs/rshim-user-space/package.nix +++ b/pkgs/by-name/rs/rshim-user-space/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "rshim-user-space"; - version = "2.2.4"; + version = "2.4.2"; src = fetchFromGitHub { owner = "Mellanox"; repo = "rshim-user-space"; rev = "rshim-${version}"; - hash = "sha256-z0Uk520vsBERbeVtxBqXPXSWhO0sLD5GCQy1dQsJdEg="; + hash = "sha256-J/gCACqpUY+KraVOLWpd+UVyZ1f2o77EfpAgUVtZL9w="; }; nativeBuildInputs = [ From fe748ee89180b3b64f282ccbc3609c93cd81133d Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Mon, 7 Jul 2025 09:19:55 +0200 Subject: [PATCH 2/5] mlxbf-bootimages: 4.10.0-13520 -> 4.11.0-13611 Update to current revision. No good changelog found. Signed-off-by: Markus Theil --- pkgs/by-name/ml/mlxbf-bootimages/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ml/mlxbf-bootimages/package.nix b/pkgs/by-name/ml/mlxbf-bootimages/package.nix index 63a8317bc572..d95122cef9e9 100644 --- a/pkgs/by-name/ml/mlxbf-bootimages/package.nix +++ b/pkgs/by-name/ml/mlxbf-bootimages/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mlxbf-bootimages"; - version = "4.10.0-13520"; + version = "4.11.0-13611"; src = fetchurl { url = "https://linux.mellanox.com/public/repo/bluefield/${version}/bootimages/prod/${pname}-signed_${version}_arm64.deb"; - hash = "sha256-lPclxhKmn1hvGXWI1A+Q1yXK7FZzKUcOtBoXG6KRsCA="; + hash = "sha256-bZpZ6qnC3Q/BuOngS4ZoU6vjeekPjVom0KdDoJF5iko="; }; nativeBuildInputs = [ From c8f46a60b9628ca2ec2454806644db4359dd43e7 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Mon, 7 Jul 2025 09:20:32 +0200 Subject: [PATCH 3/5] mlxbf-bootctl: 1.1-6 -> unstable-2025-01-16 Update to current state, as no release was made for years, but bug fixes on master arrive. Notable additions: - better support for watchdog config Signed-off-by: Markus Theil --- pkgs/by-name/ml/mlxbf-bootctl/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ml/mlxbf-bootctl/package.nix b/pkgs/by-name/ml/mlxbf-bootctl/package.nix index 8db85e010dd5..cad1b8a116f2 100644 --- a/pkgs/by-name/ml/mlxbf-bootctl/package.nix +++ b/pkgs/by-name/ml/mlxbf-bootctl/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "mlxbf-bootctl"; - version = "1.1-6"; + version = "unstable-2025-01-16"; src = fetchFromGitHub { owner = "Mellanox"; repo = "mlxbf-bootctl"; - rev = "mlxbf-bootctl-${version}"; - hash = "sha256-F49ZZtty+NARXA/doAFLhsQn4XkPW6GWLXGy4waIaM0="; + rev = "278160ca8e08251cff5e7989e5a1010bd247a6ae"; + hash = "sha256-qS35wCb8zvuF2Zs/5hPZkoZAapr7fwKQ/0ZOBPtrkRQ="; }; installPhase = '' @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { # This package is supposed to only run on a BlueField. Thus aarch64-linux # is the only relevant platform. platforms = [ "aarch64-linux" ]; - maintainers = with lib.maintainers; [ nikstur ]; + maintainers = with lib.maintainers; [ + nikstur + thillux + ]; }; } From 04514c4b7de3cc1b91aa7fe6c0063f90d9bd1182 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Mon, 7 Jul 2025 09:21:22 +0200 Subject: [PATCH 4/5] bfscripts: unstable-2023-05-15 -> unstable-2025-06-27 Multiple fixes since 2023, mlx-mkbfb faster and more features. Signed-off-by: Markus Theil --- pkgs/by-name/bf/bfscripts/package.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/bf/bfscripts/package.nix b/pkgs/by-name/bf/bfscripts/package.nix index 65be3bf4cdb6..80bc09cc4a38 100644 --- a/pkgs/by-name/bf/bfscripts/package.nix +++ b/pkgs/by-name/bf/bfscripts/package.nix @@ -1,8 +1,10 @@ { - stdenv, fetchFromGitHub, + git, lib, python3, + rpm, + stdenv, }: let @@ -36,19 +38,24 @@ let in stdenv.mkDerivation { pname = "bfscripts"; - version = "unstable-2023-05-15"; + version = "unstable-2025-06-27"; src = fetchFromGitHub { owner = "Mellanox"; repo = "bfscripts"; - rev = "1da79f3ece7cdf99b2571c00e8b14d2e112504a4"; - hash = "sha256-pTubrnZKEFmtAj/omycFYeYwrCog39zBDEszoCrsQNQ="; + rev = "ed8ede79fa002a2d83719a1bef6fbe0f7dcf37a4"; + hash = "sha256-x+hpH6D5HTl39zD0vYj6wRFw881M4AcfM+ePcgXMst8="; }; buildInputs = [ python3 ]; + nativeBuildInputs = [ + git + rpm + ]; + installPhase = '' ${lib.concatStringsSep "\n" (map (b: "install -D ${b} $out/bin/${b}") binaries)} ''; @@ -58,6 +65,9 @@ stdenv.mkDerivation { homepage = "https://github.com/Mellanox/bfscripts"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ nikstur ]; + maintainers = with maintainers; [ + nikstur + thillux + ]; }; } From 405f561c3775f7c11e173150352675cc96848024 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Mon, 7 Jul 2025 15:03:10 +0200 Subject: [PATCH 5/5] mstflint_access: use kernel Makefile for install Signed-off-by: Markus Theil --- pkgs/os-specific/linux/mstflint_access/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/mstflint_access/default.nix b/pkgs/os-specific/linux/mstflint_access/default.nix index 2b90ddf7ae65..9c4576c9256c 100644 --- a/pkgs/os-specific/linux/mstflint_access/default.nix +++ b/pkgs/os-specific/linux/mstflint_access/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installPhase = '' - runHook preInstall - - install -D ${pname}.ko $out/lib/modules/${kernel.modDirVersion}/extra/${pname}.ko - - runHook postInstall - ''; + installTargets = [ "modules_install" ]; + installFlags = [ + "-C" + "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=${placeholder "out"}" + "M=$(PWD)" + ] ++ makeFlags; meta = with lib; { description = "Kernel module for Nvidia NIC firmware update";