diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:38:09 +0200 |
| commit | 22a216849bf82ec65e3de86b7ea30e9c6b11efa4 (patch) | |
| tree | 8b425b2c80cb46a8f7a8d72beeb66777506d7bd6 /pkgs/servers/computing/slurm/default.nix | |
| parent | 415b29939b01ca13f4667d5ffa8ede8ed262b0ee (diff) | |
| download | nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.gz nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.bz2 nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.lz nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.xz nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.tar.zst nixlib-22a216849bf82ec65e3de86b7ea30e9c6b11efa4.zip | |
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c079de430fa528f688ddac781bcef16.
Diffstat (limited to 'pkgs/servers/computing/slurm/default.nix')
| -rw-r--r-- | pkgs/servers/computing/slurm/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index c448e4936f64..93e1a31abb17 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl , python, munge, perl, pam, openssl, zlib -, ncurses, mysql, gtk2, lua, hwloc, numactl +, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , readline, freeipmi, libssh2, xorg, lz4 # 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 - mysql.connector-c ncurses gtk2 lz4 + libmysqlclient ncurses gtk2 lz4 lua hwloc numactl readline freeipmi ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; |