diff options
| author | markuskowa <markus.kowalewski@gmail.com> | 2018-11-18 17:58:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 17:58:21 +0100 |
| commit | f6169667efaa4e5d55d3b2060475d791d753f174 (patch) | |
| tree | d70be82aa58a1bc2500feeac4287726ef45355a3 | |
| parent | 16dbe8e534ea930d9f37f04e14a3ecbf90d45d0e (diff) | |
| parent | 8dc5ceac7986b04361f0878334fe62b2d7e1699b (diff) | |
| download | nixpkgs-f6169667efaa4e5d55d3b2060475d791d753f174.tar nixpkgs-f6169667efaa4e5d55d3b2060475d791d753f174.tar.gz nixpkgs-f6169667efaa4e5d55d3b2060475d791d753f174.tar.bz2 nixpkgs-f6169667efaa4e5d55d3b2060475d791d753f174.tar.lz nixpkgs-f6169667efaa4e5d55d3b2060475d791d753f174.tar.xz nixpkgs-f6169667efaa4e5d55d3b2060475d791d753f174.tar.zst nixpkgs-f6169667efaa4e5d55d3b2060475d791d753f174.zip | |
Merge pull request #50576 from r-ryantm/auto-update/rdma-core
rdma-core: 20.1 -> 21
| -rw-r--r-- | pkgs/os-specific/linux/rdma-core/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index ecfd8581ca9..8f2c834672f 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, pandoc -, ethtool, nettools, libnl, udev, python, perl +, ethtool, iproute, libnl, udev, python, perl } : let - version = "20.1"; + version = "21"; in stdenv.mkDerivation { name = "rdma-core-${version}"; @@ -12,11 +12,11 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1j6d3n4wzl04m0k4nxbmahfwc094185d5jyijgvg3z5hwwb8lkwv"; + sha256 = "0q4hdm14f1xz2h0m5d821fdyp7i917rvmkas5axmfr1myv5422fl"; }; nativeBuildInputs = [ cmake pkgconfig pandoc ]; - buildInputs = [ libnl ethtool nettools udev python perl ]; + buildInputs = [ libnl ethtool iproute udev python perl ]; cmakeFlags = [ "-DCMAKE_INSTALL_RUNDIR=/run" @@ -26,7 +26,8 @@ in stdenv.mkDerivation { postPatch = '' substituteInPlace providers/rxe/rxe_cfg.in \ --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; { |