public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50576 from r-ryantm/auto-update/rdma-core

Browse Source 
rdma-core: 20.1 -> 21
This commit is contained in:
markuskowa 2018-11-18 17:58:21 +01:00 committed by GitHub
commit f6169667ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/os-specific/linux/rdma-core/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, pandoc { stdenv, fetchFromGitHub, cmake, pkgconfig, pandoc
, ethtool, nettools, libnl, udev, python, perl , ethtool, iproute, libnl, udev, python, perl
} : } :
let let
version = "20.1"; version = "21";
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "rdma-core-${version}"; name = "rdma-core-${version}";
@ -12,11 +12,11 @@ in stdenv.mkDerivation {
owner = "linux-rdma"; owner = "linux-rdma";
repo = "rdma-core"; repo = "rdma-core";
rev = "v${version}"; rev = "v${version}";
sha256 = "1j6d3n4wzl04m0k4nxbmahfwc094185d5jyijgvg3z5hwwb8lkwv"; sha256 = "0q4hdm14f1xz2h0m5d821fdyp7i917rvmkas5axmfr1myv5422fl";
}; };
nativeBuildInputs = [ cmake pkgconfig pandoc ]; nativeBuildInputs = [ cmake pkgconfig pandoc ];
buildInputs = [ libnl ethtool nettools udev python perl ]; buildInputs = [ libnl ethtool iproute udev python perl ];
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_INSTALL_RUNDIR=/run" "-DCMAKE_INSTALL_RUNDIR=/run"
@ -26,7 +26,8 @@ in stdenv.mkDerivation {
postPatch = '' postPatch = ''
substituteInPlace providers/rxe/rxe_cfg.in \ substituteInPlace providers/rxe/rxe_cfg.in \
--replace ethtool "${ethtool}/bin/ethtool" \ --replace ethtool "${ethtool}/bin/ethtool" \
--replace ifconfig "${nettools}/bin/ifconfig" --replace 'ip addr' "${iproute}/bin/ip addr" \
--replace 'ip link' "${iproute}/bin/ip link"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {