From c6b828b86eef331e26840e11da0114472c020beb Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 20 Jan 2018 15:09:14 -0800 Subject: [PATCH] rdma-core: init at 16.1 --- .../development/libraries/openmpi/default.nix | 4 +-- pkgs/os-specific/linux/rdma-core/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 pkgs/os-specific/linux/rdma-core/default.nix diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 35d72c6cbecb..c2f79753bd19 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gfortran, perl, libibverbs +{stdenv, fetchurl, gfortran, perl, rdma-core # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ gfortran ] - ++ optional (stdenv.isLinux || stdenv.isFreeBSD) libibverbs; + ++ optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core; nativeBuildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix new file mode 100644 index 000000000000..22ce4a10f1c8 --- /dev/null +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, ethtool, libnl, libudev, python, perl +} : + +let + version = "16.1"; + +in stdenv.mkDerivation { + name = "rdma-core-${version}"; + + src = fetchFromGitHub { + owner = "linux-rdma"; + repo = "rdma-core"; + rev = "v${version}"; + sha256 = "1fixw6hpf732vzlpczx0b2y84jrhgfjr3cljqxky7makzgh2s7ng"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libnl ethtool libudev python perl ]; + + postFixup = '' + substituteInPlace $out/bin/rxe_cfg --replace ethtool "${ethtool}/bin/ethtool" + ''; + + meta = with stdenv.lib; { + description = "RDMA Core Userspace Libraries and Daemons"; + homepage = https://github.com/linux-rdma/rdma-core; + license = licenses.gpl2; + maintainers = with maintainers; [ markuskowa ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7dedb007179..c4568d042a8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4321,6 +4321,8 @@ with pkgs; rc = callPackage ../shells/rc { }; + rdma-core = callPackage ../os-specific/linux/rdma-core { }; + read-edid = callPackage ../os-specific/linux/read-edid { }; redir = callPackage ../tools/networking/redir { };