diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:37:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-22 09:37:41 +0200 |
| commit | 415b29939b01ca13f4667d5ffa8ede8ed262b0ee (patch) | |
| tree | 1155f60675070ab417bb59acec82d9f57fb02a61 /pkgs/servers/computing/slurm/default.nix | |
| parent | 22d7eb74d9b554fe6a18e6542ff85bc38f0bc923 (diff) | |
| parent | f51c0f66713c8ca5affc59385f2daa14d556b023 (diff) | |
| download | nixlib-415b29939b01ca13f4667d5ffa8ede8ed262b0ee.tar nixlib-415b29939b01ca13f4667d5ffa8ede8ed262b0ee.tar.gz nixlib-415b29939b01ca13f4667d5ffa8ede8ed262b0ee.tar.bz2 nixlib-415b29939b01ca13f4667d5ffa8ede8ed262b0ee.tar.lz nixlib-415b29939b01ca13f4667d5ffa8ede8ed262b0ee.tar.xz nixlib-415b29939b01ca13f4667d5ffa8ede8ed262b0ee.tar.zst nixlib-415b29939b01ca13f4667d5ffa8ede8ed262b0ee.zip | |
Merge branch 'master' into staging-next
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 93e1a31abb17..c448e4936f64 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, libmysqlclient, gtk2, lua, hwloc, numactl +, ncurses, mysql, 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 - libmysqlclient ncurses gtk2 lz4 + mysql.connector-c ncurses gtk2 lz4 lua hwloc numactl readline freeipmi ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; |