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

Merge pull request #271865 from markuskowa/upd-slurm

Browse Source 
slurm: 23.02.6.1 -> 23.11.0.1
This commit is contained in:
markuskowa
2024-01-01 18:23:14 +01:00
committed by GitHub
parent d33399375f 1c32f80b88
commit 1d0358e5c9
6 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/computing/slurm-spank-stunnel/default.nix
+3 -1
View File
@@ -11,8 +11,10 @@ stdenv.mkDerivation rec {
sha256 = "15cpd49ccvzsmmr3gk8svm2nz461rvs4ybczckyf4yla0xzp06gj";
};
patches = [ ./hostlist.patch ];
buildPhase = ''
gcc -I${slurm.dev}/include -shared -fPIC -o stunnel.so slurm-spank-stunnel.c
gcc -I${lib.getDev slurm}/include -shared -fPIC -o stunnel.so slurm-spank-stunnel.c
'';
installPhase = ''
pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/slurm-spank-stunnel.c b/slurm-spank-stunnel.c
index 81fb4fd..dbe69f6 100644
--- a/slurm-spank-stunnel.c
+++ b/slurm-spank-stunnel.c
@@ -278,7 +278,7 @@ int _stunnel_connect_nodes (char* nodes)
{
char* host;
- hostlist_t hlist;
+ hostlist_t *hlist;
// Connect to the first host in the list
hlist = slurm_hostlist_create(nodes);
pkgs/servers/computing/slurm-spank-x11/default.nix
+3 -1
View File
@@ -10,10 +10,12 @@ stdenv.mkDerivation rec {
sha256 = "1dmsr7whxcxwnlvl1x4s3bqr5cr6q5ssb28vqi67w5hj4sshisry";
};
patches = [ ./hostlist.patch ];
buildPhase = ''
gcc -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" \
-g -o slurm-spank-x11 slurm-spank-x11.c
gcc -I${slurm.dev}/include -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" -shared -fPIC \
gcc -I${lib.getDev slurm}/include -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" -shared -fPIC \
-g -o x11.so slurm-spank-x11-plug.c
'';
pkgs/servers/computing/slurm-spank-x11/hostlist.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/slurm-spank-x11-plug.c b/slurm-spank-x11-plug.c
index bef6c14..7cb77c4 100644
--- a/slurm-spank-x11-plug.c
+++ b/slurm-spank-x11-plug.c
@@ -608,7 +608,7 @@ int _connect_node (char* node,uint32_t jobid,uint32_t stepid)
int _x11_connect_nodes (char* nodes,uint32_t jobid,uint32_t stepid)
{
char* host;
- hostlist_t hlist;
+ hostlist_t *hlist;
int n=0;
int i;
pkgs/servers/computing/slurm/common-env-echo.patch
+4 -4
View File
@@ -1,13 +1,13 @@
diff --git a/src/common/env.c b/src/common/env.c
index 987846d..73d3b3b 100644
index 4dad18fef1..730f28af96 100644
--- a/src/common/env.c
+++ b/src/common/env.c
@@ -1941,7 +1941,7 @@ char **env_array_user_default(const char *username, int timeout, int mode,
@@ -2073,7 +2073,7 @@ char **env_array_user_default(const char *username, int timeout, int mode,
char **env = NULL;
char *starttoken = "XXXXSLURMSTARTPARSINGHEREXXXX";
char *stoptoken = "XXXXSLURMSTOPPARSINGHEREXXXXX";
- char cmdstr[256], *env_loc = NULL;
+ char cmdstr[MAXPATHLEN], *env_loc = NULL;
+ char cmdstr[PATH_MAX], *env_loc = NULL;
char *stepd_path = NULL;
int fd1, fd2, fildes[2], found, fval, len, rc, timeleft;
int fildes[2], found, fval, len, rc, timeleft;
int buf_read, buf_rem, config_timeout;
pkgs/servers/computing/slurm/default.nix
+6 -6
View File
@@ -14,7 +14,7 @@
stdenv.mkDerivation rec {
pname = "slurm";
version = "23.02.7.1";
version = "23.11.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.
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
repo = "slurm";
# The release tags use - instead of .
rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
sha256 = "sha256-0u96KnEahx7noA8vQEkC1f+hv4d3NGPmnof9G7bA7Oc=";
hash = "sha256-+8oDNfNg9WGET1iWarhZbQEOdjHjSshIB/otdYvl18c=";
};
outputs = [ "out" "dev" ];
@@ -60,12 +60,12 @@ stdenv.mkDerivation rec {
configureFlags = with lib;
[ "--with-freeipmi=${freeipmi}"
"--with-http-parser=${http-parser}"
"--with-hwloc=${hwloc.dev}"
"--with-json=${json_c.dev}"
"--with-hwloc=${lib.getDev hwloc}"
"--with-json=${lib.getDev json_c}"
"--with-jwt=${libjwt}"
"--with-lz4=${lz4.dev}"
"--with-lz4=${lib.getDev lz4}"
"--with-munge=${munge}"
"--with-yaml=${libyaml.dev}"
"--with-yaml=${lib.getDev libyaml}"
"--with-ofed=${lib.getDev rdma-core}"
"--sysconfdir=/etc/slurm"
"--with-pmix=${pmix}"