From 25aec847adecb63e115e905b59a4e501ce81bc7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 May 2026 04:10:08 +0000 Subject: [PATCH] slurm: 25-11-6-1 -> 26.05.0.1 * replace http-parser with llhttp http-parser is deprecated. Add "--enable-slurmrestd" to force build failure if slurmrestd can not be built. * fix version string; - -> . --- pkgs/by-name/sl/slurm/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix index da347b5a949e..fc1a76af1245 100644 --- a/pkgs/by-name/sl/slurm/package.nix +++ b/pkgs/by-name/sl/slurm/package.nix @@ -30,7 +30,7 @@ libjwt, libyaml, json_c, - http-parser, + llhttp, # enable internal X11 support via libssh2 enableX11 ? true, enablePAM ? true, @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "slurm"; - version = "25-11-6-1"; + version = "26.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. @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "slurm"; # The release tags use - instead of . rev = "slurm-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; - hash = "sha256-8Op/HP0v+cqhdPP6ZLmw+e/SSlFUznydD2pHpqr6kfU="; + hash = "sha256-pEgSPaLGqPeNsw0DkxnZP4n6jx5fy+wTgAu0LZmxmW0="; }; outputs = [ @@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { libyaml dbus libbpf - http-parser + llhttp s2n-tls ] ++ lib.optionals enableX11 [ xauth ] @@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--with-freeipmi=${freeipmi}" - "--with-http-parser=${http-parser}" + "--with-llhttp-parser=${lib.getDev llhttp}" "--with-hwloc=${lib.getDev hwloc}" "--with-json=${lib.getDev json_c}" "--with-jwt=${libjwt}" @@ -132,6 +132,7 @@ stdenv.mkDerivation (finalAttrs: { "--sysconfdir=/etc/slurm" "--with-pmix=${lib.getDev pmix}" "--with-bpf=${libbpf}" + "--enable-slurmrestd" "--with-s2n=${ symlinkJoin { name = s2n-tls.name;