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

slurm: remove obsolete dependencies

Browse Source 
libssh and openssl are not required anymore
This commit is contained in:
Markus Kowalewski 2020-06-22 13:14:21 +02:00
parent d245896789
commit 335c487686
No known key found for this signature in database
GPG Key ID: D865C8A91D7025EB
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/computing/slurm/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl { stdenv, fetchFromGitHub, pkgconfig, libtool, curl
, python, munge, perl, pam, openssl, zlib, shadow, coreutils , python, munge, perl, pam, zlib, shadow, coreutils
, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
, readline, freeipmi, libssh2, xorg, lz4, rdma-core, nixosTests , readline, freeipmi, xorg, lz4, rdma-core, nixosTests
# enable internal X11 support via libssh2 # enable internal X11 support via libssh2
, enableX11 ? true , enableX11 ? true
}: }:
@ -37,22 +37,20 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig libtool ]; nativeBuildInputs = [ pkgconfig libtool ];
buildInputs = [ buildInputs = [
curl python munge perl pam openssl zlib curl python munge perl pam zlib
libmysqlclient ncurses gtk2 lz4 rdma-core libmysqlclient ncurses gtk2 lz4 rdma-core
lua hwloc numactl readline freeipmi shadow.su lua hwloc numactl readline freeipmi shadow.su
] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; ] ++ stdenv.lib.optionals enableX11 [ xorg.xauth ];
configureFlags = with stdenv.lib; configureFlags = with stdenv.lib;
[ "--with-freeipmi=${freeipmi}" [ "--with-freeipmi=${freeipmi}"
"--with-hwloc=${hwloc.dev}" "--with-hwloc=${hwloc.dev}"
"--with-lz4=${lz4.dev}" "--with-lz4=${lz4.dev}"
"--with-munge=${munge}" "--with-munge=${munge}"
"--with-ssl=${openssl.dev}"
"--with-zlib=${zlib}" "--with-zlib=${zlib}"
"--with-ofed=${rdma-core}" "--with-ofed=${rdma-core}"
"--sysconfdir=/etc/slurm" "--sysconfdir=/etc/slurm"
] ++ (optional (gtk2 == null) "--disable-gtktest") ] ++ (optional (gtk2 == null) "--disable-gtktest")
++ (optional enableX11 "--with-libssh2=${libssh2.dev}")
++ (optional (!enableX11) "--disable-x11"); ++ (optional (!enableX11) "--disable-x11");