From af4491f26c7b03e9952ebb697dc4fdfebb1dfa95 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 10 Jun 2020 10:48:29 +0200 Subject: [PATCH 1/3] slurm: 19.05.5.1 -> 19.05.7.1 --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 1554fb69f19..cd0d67ecfed 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "19.05.5.1"; + version = "19.05.7.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "0f0gv3sirp6sxdrbwydsbcqicjbmrpm58yhgbsar8v6nx3g6y3hx"; + sha256 = "115f40k8y7d569nbl6g0mkyshgv925lawlwar7ib5296g30p97f0"; }; outputs = [ "out" "dev" ]; From 5d8f61f3bfb8f93751c1e455f51393f10d507e0f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 10 Jun 2020 10:55:05 +0200 Subject: [PATCH 2/3] slurm: bugifx, add su/echo paths slurmd requires su and echo to work with "--get-user-env". If slurmd does not find /bin/su or /bin/echo, it crashes. --- pkgs/servers/computing/slurm/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index cd0d67ecfed..9e610579d73 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl -, python, munge, perl, pam, openssl, zlib +, python, munge, perl, pam, openssl, zlib, shadow, coreutils , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , readline, freeipmi, libssh2, xorg, lz4, rdma-core # enable internal X11 support via libssh2 @@ -22,10 +22,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - prePatch = stdenv.lib.optional enableX11 '' + prePatch = '' + substituteInPlace src/common/env.c \ + --replace "/bin/echo" "${coreutils}/bin/echo" + '' + (stdenv.lib.optionalString enableX11 '' substituteInPlace src/common/x11_util.c \ --replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"' - ''; + ''); # nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode' # https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es @@ -36,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl python munge perl pam openssl zlib libmysqlclient ncurses gtk2 lz4 rdma-core - lua hwloc numactl readline freeipmi + lua hwloc numactl readline freeipmi shadow.su ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ]; configureFlags = with stdenv.lib; From 97c6e005ac67aa7b9867267d076af1afa310e6dc Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 10 Jun 2020 14:37:20 +0200 Subject: [PATCH 3/3] slurm: add passthru.tests --- pkgs/servers/computing/slurm/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 9e610579d73..1f09c98377f 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, libtool, curl , python, munge, perl, pam, openssl, zlib, shadow, coreutils , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl -, readline, freeipmi, libssh2, xorg, lz4, rdma-core +, readline, freeipmi, libssh2, xorg, lz4, rdma-core, nixosTests # enable internal X11 support via libssh2 , enableX11 ? true }: @@ -67,6 +67,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests.slurm = nixosTests.slurm; + meta = with stdenv.lib; { homepage = "http://www.schedmd.com/"; description = "Simple Linux Utility for Resource Management";