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

Merge pull request #175316 from markuskowa/upd-slurm

Browse Source 
slurm: 21.08.8.2 -> 22.05.0.1
This commit is contained in:
markuskowa 2022-05-30 21:18:28 +02:00 committed by GitHub
commit 412168b4ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/computing/slurm/slurm.nix
View File

@ -361,8 +361,13 @@ in
++ lib.optional cfg.enableSrunX11 slurm-spank-x11;
wantedBy = [ "multi-user.target" ];
after = [ "systemd-tmpfiles-clean.service" ];
requires = [ "network.target" ];
after = [
"systemd-tmpfiles-clean.service"
"munge.service"
"network-online.target"
"remote-fs.target"
];
wants = [ "network-online.target" ];
serviceConfig = {
Type = "forking";
@ -371,6 +376,7 @@ in
PIDFile = "/run/slurmd.pid";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
LimitMEMLOCK = "infinity";
Delegate="Yes";
};
};

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

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, libtool, curl
, python3, munge, perl, pam, shadow, coreutils
, python3, munge, perl, pam, shadow, coreutils, dbus, libbpf
, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
, readline, freeipmi, xorg, lz4, rdma-core, nixosTests
, pmix
@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "slurm";
version = "21.08.8.2";
version = "22.05.0.1";
# N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
# because the latter does not keep older releases.
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "1n9gn879lff3iv2yi163fv2cwymgfqigh0jxs2kklc97g3nn23yx";
sha256 = "0bc8kycrc5a8kqffbd03k22z38f7z8fj725iniq8hz6srhf5nxgs";
};
outputs = [ "out" "dev" ];
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
curl python3 munge perl pam
libmysqlclient ncurses gtk2 lz4 rdma-core
lua hwloc numactl readline freeipmi shadow.su
pmix json_c libjwt libyaml
pmix json_c libjwt libyaml dbus libbpf
] ++ lib.optionals enableX11 [ xorg.xauth ];
configureFlags = with lib;
@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
"--with-ofed=${rdma-core}"
"--sysconfdir=/etc/slurm"
"--with-pmix=${pmix}"
"--with-bpf=${libbpf}"
] ++ (optional (gtk2 == null) "--disable-gtktest")
++ (optional (!enableX11) "--disable-x11");