diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/computing')
6 files changed, 42 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/servers/computing/slurm-spank-stunnel/default.nix b/nixpkgs/pkgs/servers/computing/slurm-spank-stunnel/default.nix index 9fdd5625f78f..3534c8981a26 100644 --- a/nixpkgs/pkgs/servers/computing/slurm-spank-stunnel/default.nix +++ b/nixpkgs/pkgs/servers/computing/slurm-spank-stunnel/default.nix @@ -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 = '' diff --git a/nixpkgs/pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch b/nixpkgs/pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch new file mode 100644 index 000000000000..0fc1d0626aab --- /dev/null +++ b/nixpkgs/pkgs/servers/computing/slurm-spank-stunnel/hostlist.patch @@ -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); diff --git a/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix b/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix index 8a8aa34fdb2d..4a5e2d52b2f5 100644 --- a/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix +++ b/nixpkgs/pkgs/servers/computing/slurm-spank-x11/default.nix @@ -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 ''; diff --git a/nixpkgs/pkgs/servers/computing/slurm-spank-x11/hostlist.patch b/nixpkgs/pkgs/servers/computing/slurm-spank-x11/hostlist.patch new file mode 100644 index 000000000000..c60bab236cea --- /dev/null +++ b/nixpkgs/pkgs/servers/computing/slurm-spank-x11/hostlist.patch @@ -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; + diff --git a/nixpkgs/pkgs/servers/computing/slurm/common-env-echo.patch b/nixpkgs/pkgs/servers/computing/slurm/common-env-echo.patch index 4236421a63d2..cff52116d145 100644 --- a/nixpkgs/pkgs/servers/computing/slurm/common-env-echo.patch +++ b/nixpkgs/pkgs/servers/computing/slurm/common-env-echo.patch @@ -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; diff --git a/nixpkgs/pkgs/servers/computing/slurm/default.nix b/nixpkgs/pkgs/servers/computing/slurm/default.nix index 21fd28f29923..7308623b16f7 100644 --- a/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -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}" |