Merge pull request #311374 from thillux/mtheil/update-mstflint

mstflint: 4.26.0-1 -> 4.28.0-1
This commit is contained in:
nikstur 2024-05-13 18:14:57 +02:00 committed by GitHub
commit 7ed944be63
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 16 deletions

View File

@ -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-rfZts0m8x6clVazpbAa2xK+dYgRU9Us5rbcWa0uHJ1M=";
hash = "sha256-bWYglHJUNCPT13N7aBdjbLPMZIk7vjvF+o9W3abDNr0=";
};
nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies;
@ -18,10 +18,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
preConfigure = lib.optionals (lib.versionAtLeast kernel.version "6.4") ''
sed -i "s/class_create(THIS_MODULE, dev->name)/class_create(dev->name)/g" mst_main.c
'';
installPhase = ''
runHook preInstall

View File

@ -26,22 +26,13 @@
stdenv.mkDerivation rec {
pname = "mstflint";
version = "4.26.0-1";
version = "4.28.0-1";
src = fetchurl {
url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/mstflint-${version}.tar.gz";
hash = "sha256-P8XACcz6d8UTOhFFeTijfFOthBqnUghGlDj9K145sZ8=";
hash = "sha256-zvCDc/9wAqT3XBI9A5kOprnnm52Ek8oGe2Je3dKHti0=";
};
patches = [
# needed to introduce this with GCC 13. Remove, when https://github.com/Mellanox/mstflint/pull/916 is upstream.
(fetchpatch {
name = "elf.patch";
url = "https://patch-diff.githubusercontent.com/raw/Mellanox/mstflint/pull/916.patch";
hash = "sha256-quBdmiuzwThu4MkAaT74eJDlZwIcUZMrLZa8OIcO96w=";
})
];
nativeBuildInputs = [
autoconf
automake