diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-21 20:05:09 +0200 |
| commit | f8a8fc6c7c079de430fa528f688ddac781bcef16 (patch) | |
| tree | 08c4f42540499cdac0331e8727cde16baabd08f4 /pkgs/servers/computing | |
| parent | 6be720b3a756662bb31adfdc1948553a02057c16 (diff) | |
| download | nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.gz nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.bz2 nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.lz nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.xz nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.tar.zst nixpkgs-f8a8fc6c7c079de430fa528f688ddac781bcef16.zip | |
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f3728bd64b80721c44ed1fb019978cbc1b, reversing changes made to f0fec244ca380b9d3e617ee7b419c59758c8b0f1. Let's delay this. We have some serious regressions.
Diffstat (limited to 'pkgs/servers/computing')
| -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 93e1a31abb1..c448e4936f6 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 ]; |