diff options
| author | markuskowa <markus.kowalewski@gmail.com> | 2020-02-22 17:33:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-22 17:33:47 +0100 |
| commit | 74dcd1c6374b7f88bf9a314d184da297ba288577 (patch) | |
| tree | bf627a09cb9f3ecd4832c1f1f3c9d72f9950a59c /pkgs/servers | |
| parent | 1035f7259fe1bd899b3e2ebbdfefd381a9e3dedd (diff) | |
| parent | 7598200b9bc09f95cd032c6956c7b87d6d783629 (diff) | |
| download | nixlib-74dcd1c6374b7f88bf9a314d184da297ba288577.tar nixlib-74dcd1c6374b7f88bf9a314d184da297ba288577.tar.gz nixlib-74dcd1c6374b7f88bf9a314d184da297ba288577.tar.bz2 nixlib-74dcd1c6374b7f88bf9a314d184da297ba288577.tar.lz nixlib-74dcd1c6374b7f88bf9a314d184da297ba288577.tar.xz nixlib-74dcd1c6374b7f88bf9a314d184da297ba288577.tar.zst nixlib-74dcd1c6374b7f88bf9a314d184da297ba288577.zip | |
Merge pull request #80617 from ikervagyok/slurm
Slurm: improve RDMA capability
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/computing/slurm/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 637ac0607db1..18ef3bf3fa55 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl , python, munge, perl, pam, openssl, zlib , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl -, readline, freeipmi, libssh2, xorg, lz4 +, readline, freeipmi, libssh2, xorg, lz4, rdma-core # enable internal X11 support via libssh2 , enableX11 ? true }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool ]; buildInputs = [ curl python munge perl pam openssl zlib - libmysqlclient ncurses gtk2 lz4 + libmysqlclient ncurses gtk2 lz4 rdma-core lua hwloc numactl readline freeipmi ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { "--with-munge=${munge}" "--with-ssl=${openssl.dev}" "--with-zlib=${zlib}" + "--with-ofed=${rdma-core}" "--sysconfdir=/etc/slurm" ] ++ (optional (gtk2 == null) "--disable-gtktest") ++ (optional enableX11 "--with-libssh2=${libssh2.dev}") |