diff options
| author | markuskowa <markus.kowalewski@gmail.com> | 2021-01-21 20:08:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-21 20:08:18 +0100 |
| commit | afa23b8a4be2e536cb6f905833a76f1434dffc65 (patch) | |
| tree | 773bd3eef5f6639ff5177f9a45422ed02a71e9cf | |
| parent | 39b25bbbb58966643c1d2ba1d05e51cba1f58084 (diff) | |
| parent | dcae37989f91edc9a5d6cd5c6131f94645ae18dd (diff) | |
Merge pull request #110367 from markuskowa/upd-slurm
slurm: 20.11.2.1 -> 20.11.3.1
| -rw-r--r-- | nixos/tests/slurm.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/computing/slurm/default.nix | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix index 97e031a62793..3702d243b486 100644 --- a/nixos/tests/slurm.nix +++ b/nixos/tests/slurm.nix @@ -109,12 +109,12 @@ in { ensurePermissions = { "slurm_acct_db.*" = "ALL PRIVILEGES"; }; name = "slurm"; }]; - extraOptions = '' + settings.mysqld = { # recommendations from: https://slurm.schedmd.com/accounting.html#mysql-configuration - innodb_buffer_pool_size=1024M - innodb_log_file_size=64M - innodb_lock_wait_timeout=900 - ''; + innodb_buffer_pool_size="1024M"; + innodb_log_file_size="64M"; + innodb_lock_wait_timeout=900; + }; }; }; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 5e2bf5a97553..9c3b27f3d254 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.11.2.1"; + version = "20.11.3.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "02vz386ix28yr2lrn9z0hycqmw1d0npvwvx51fhp2mav66rrx79p"; + sha256 = "1601h7gid7fyvgmvrmz0h0xkxd7whp06rmj03822bv1szqr20xyy"; }; outputs = [ "out" "dev" ]; |