about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorLassulus <github@lassul.us>2020-05-26 21:59:30 +0200
committerGitHub <noreply@github.com>2020-05-26 21:59:30 +0200
commit7e80329ba5903ce81f90d5f3b8d073fd065b2cf4 (patch)
tree07dbecfa9fa4d48c2980c6684db2e6fc50009896 /pkgs/tools
parent7a36742c3687159e62a03773f8edf075dff23ac7 (diff)
parent1df35d94ec6e96bb12683d3017d96a0e3dbc93e4 (diff)
downloadnixlib-7e80329ba5903ce81f90d5f3b8d073fd065b2cf4.tar
nixlib-7e80329ba5903ce81f90d5f3b8d073fd065b2cf4.tar.gz
nixlib-7e80329ba5903ce81f90d5f3b8d073fd065b2cf4.tar.bz2
nixlib-7e80329ba5903ce81f90d5f3b8d073fd065b2cf4.tar.lz
nixlib-7e80329ba5903ce81f90d5f3b8d073fd065b2cf4.tar.xz
nixlib-7e80329ba5903ce81f90d5f3b8d073fd065b2cf4.tar.zst
nixlib-7e80329ba5903ce81f90d5f3b8d073fd065b2cf4.zip
Merge pull request #81913 from helsinki-systems/upd/mstflint
mstflint: 4.4 -> 4.14
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/misc/mstflint/default.nix25
1 files changed, 16 insertions, 9 deletions
diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix
index c44934ef45c3..cf90e93929de 100644
--- a/pkgs/tools/misc/mstflint/default.nix
+++ b/pkgs/tools/misc/mstflint/default.nix
@@ -1,19 +1,26 @@
-{ stdenv, fetchurl, zlib, libibmad }:
+{ stdenv, autoreconfHook, fetchFromGitHub, zlib, libibmad, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "mstflint-4.4.0-1.12.gd1edd58";
+  pname = "mstflint";
+  version = "4.14.0-1";
 
-  src = fetchurl {
-    url = "https://www.openfabrics.org/downloads/mstflint/${name}.tar.gz";
-    sha256 = "0kg33i5s5zdc7kigww62r0b824zfw06r757fl6jwrq7lj91j0380";
+  src = fetchFromGitHub {
+    owner = "Mellanox";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0xrwx623vl17cqzpacil74m2fi4xrshgvvzxiplz1wq47gq7wp1i";
   };
 
-  buildInputs = [ zlib libibmad ];
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ zlib libibmad openssl ];
+
+  hardeningDisable = [ "format" ];
+
+  dontDisableStatic = true;  # the build fails without this. should probably be reported upstream
 
   meta = with stdenv.lib; {
-    homepage = "https://www.openfabrics.org/";
-    license = licenses.gpl2;
+    homepage = "https://github.com/Mellanox/mstflint";
+    license = with licenses; [ gpl2 bsd2 ];
     platforms = platforms.linux;
-    broken = true; # 2018-04-11
   };
 }