From 109eac70e59b03246000775cef72d7344a4a7b97 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 11 Aug 2025 10:31:38 +0200
Subject: [PATCH] slurm: 25.05.1.1 -> 25.05.2.1

Remove common-env-echo.patch.
Not needed anymore due to https://github.com/SchedMD/slurm/commit/5124d3aeab1c6ad4132cf8ef087ae7aa2202471b
---
 pkgs/by-name/sl/slurm/common-env-echo.patch | 13 -------------
 pkgs/by-name/sl/slurm/package.nix           | 10 ++--------
 2 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/by-name/sl/slurm/common-env-echo.patch

diff --git a/pkgs/by-name/sl/slurm/common-env-echo.patch b/pkgs/by-name/sl/slurm/common-env-echo.patch
deleted file mode 100644
index cff52116d145..000000000000
--- a/pkgs/by-name/sl/slurm/common-env-echo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/common/env.c b/src/common/env.c
-index 4dad18fef1..730f28af96 100644
---- a/src/common/env.c
-+++ b/src/common/env.c
-@@ -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[PATH_MAX], *env_loc = NULL;
- 	char *stepd_path = NULL;
- 	int fildes[2], found, fval, len, rc, timeleft;
- 	int buf_read, buf_rem, config_timeout;
diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix
index 42a622a51c30..6e325de204d4 100644
--- a/pkgs/by-name/sl/slurm/package.nix
+++ b/pkgs/by-name/sl/slurm/package.nix
@@ -41,7 +41,7 @@
 
 stdenv.mkDerivation rec {
   pname = "slurm";
-  version = "25.05.1.1";
+  version = "25.05.2.1";
 
   # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
   # because the latter does not keep older releases.
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     repo = "slurm";
     # The release tags use - instead of .
     rev = "${pname}-${builtins.replaceStrings [ "." ] [ "-" ] version}";
-    hash = "sha256-Lu/ebXI8U4XggYhQ+yyKmGXpgqtCeYMWB3o0+Ujzj0s=";
+    hash = "sha256-RpMzn8x378QWMFFj5pn8b9j1jWLKGEbvINt0PMsCIHI=";
   };
 
   outputs = [
@@ -58,12 +58,6 @@ stdenv.mkDerivation rec {
     "dev"
   ];
 
-  patches = [
-    # increase string length to allow for full
-    # path of 'echo' in nix store
-    ./common-env-echo.patch
-  ];
-
   prePatch = ''
     substituteInPlace src/common/env.c \
         --replace "/bin/echo" "${coreutils}/bin/echo"