Commit 109eac70 authored by Markus Kowalewski's avatar Markus Kowalewski
Browse files

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
parent 9ba77d6e

pkgs/by-name/sl/slurm/common-env-echo.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
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;

pkgs/by-name/sl/slurm/package.nix

+2 −8
Original line number Diff line number Diff line
@@ -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"