From 25aec847adecb63e115e905b59a4e501ce81bc7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 May 2026 04:10:08 +0000
Subject: [PATCH 1/3] 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;

From dba6c890cbde98e0a428fc6d7bdbd552a35b836a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 4 Jun 2026 14:38:13 +0200
Subject: [PATCH 2/3] slurm-spank-stunnel: add backward compatibility patch

---
 .../sl/slurm-spank-stunnel/backward-compat.patch  | 15 +++++++++++++++
 pkgs/by-name/sl/slurm-spank-stunnel/package.nix   |  5 ++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/sl/slurm-spank-stunnel/backward-compat.patch

diff --git a/pkgs/by-name/sl/slurm-spank-stunnel/backward-compat.patch b/pkgs/by-name/sl/slurm-spank-stunnel/backward-compat.patch
new file mode 100644
index 000000000000..b173af0aafbb
--- /dev/null
+++ b/pkgs/by-name/sl/slurm-spank-stunnel/backward-compat.patch
@@ -0,0 +1,15 @@
+diff --git a/slurm-spank-stunnel.c b/slurm-spank-stunnel.c
+index b79cea0..c135bf5 100644
+--- a/slurm-spank-stunnel.c
++++ b/slurm-spank-stunnel.c
+@@ -41,6 +41,10 @@
+ #include <arpa/inet.h>
+ #include <errno.h>
+ 
++#ifndef SLURM_BACKWARD_COMPAT
++#define SLURM_BACKWARD_COMPAT 1
++#endif
++
+ #include <slurm/slurm.h>
+ #include <slurm/spank.h>
+ 
diff --git a/pkgs/by-name/sl/slurm-spank-stunnel/package.nix b/pkgs/by-name/sl/slurm-spank-stunnel/package.nix
index 9f9faf653a5f..4ee7ded8530e 100644
--- a/pkgs/by-name/sl/slurm-spank-stunnel/package.nix
+++ b/pkgs/by-name/sl/slurm-spank-stunnel/package.nix
@@ -16,7 +16,10 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "15cpd49ccvzsmmr3gk8svm2nz461rvs4ybczckyf4yla0xzp06gj";
   };
 
-  patches = [ ./hostlist.patch ];
+  patches = [
+    ./hostlist.patch
+    ./backward-compat.patch
+  ];
 
   buildPhase = ''
     gcc -I${lib.getDev slurm}/include -shared -fPIC -o stunnel.so slurm-spank-stunnel.c

From 99602dbb5e2709fea4d2aaea516f9e9b92412c2a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 4 Jun 2026 14:39:10 +0200
Subject: [PATCH 3/3] slurm-spank-x11: add backward compatibility patch

---
 .../sl/slurm-spank-x11/backward-compat.patch      | 15 +++++++++++++++
 pkgs/by-name/sl/slurm-spank-x11/package.nix       |  5 ++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/sl/slurm-spank-x11/backward-compat.patch

diff --git a/pkgs/by-name/sl/slurm-spank-x11/backward-compat.patch b/pkgs/by-name/sl/slurm-spank-x11/backward-compat.patch
new file mode 100644
index 000000000000..2787692b63cc
--- /dev/null
+++ b/pkgs/by-name/sl/slurm-spank-x11/backward-compat.patch
@@ -0,0 +1,15 @@
+diff --git a/slurm-spank-x11-plug.c b/slurm-spank-x11-plug.c
+index bef6c14..feaf041 100644
+--- a/slurm-spank-x11-plug.c
++++ b/slurm-spank-x11-plug.c
+@@ -36,6 +36,10 @@
+ 
+ #include <stdint.h>
+ 
++#ifndef SLURM_BACKWARD_COMPAT
++#define SLURM_BACKWARD_COMPAT 1
++#endif
++
+ #include <slurm/slurm.h>
+ #include <slurm/spank.h>
+ 
diff --git a/pkgs/by-name/sl/slurm-spank-x11/package.nix b/pkgs/by-name/sl/slurm-spank-x11/package.nix
index 381b9aaf88c2..5a5d694c9b3e 100644
--- a/pkgs/by-name/sl/slurm-spank-x11/package.nix
+++ b/pkgs/by-name/sl/slurm-spank-x11/package.nix
@@ -15,7 +15,10 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "1dmsr7whxcxwnlvl1x4s3bqr5cr6q5ssb28vqi67w5hj4sshisry";
   };
 
-  patches = [ ./hostlist.patch ];
+  patches = [
+    ./hostlist.patch
+    ./backward-compat.patch
+  ];
 
   # Required for build with gcc-14
   env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";