Unverified Commit f14e2348 authored by Markus Kowalewski's avatar Markus Kowalewski Committed by GitHub
Browse files

slurm: 25.05.3.1 -> 25.11.1.1 (#474354)

parents b879692f 367d99d5
Loading
Loading
Loading
Loading
+12 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
  fetchpatch,
  runCommand,
  config,
  pkg-config,
@@ -41,7 +42,7 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "slurm";
  version = "25.05.3.1";
  version = "25.11.1.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 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
    repo = "slurm";
    # The release tags use - instead of .
    rev = "slurm-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
    hash = "sha256-W/q9eN4Ov3pxp2qyr3b7G4ayDaNtFUPQeAcOHCB23Q8=";
    hash = "sha256-Hv0rqogwZH5GafwlELghAbKLwurd8x30u9DJZylBQP0=";
  };

  outputs = [
@@ -58,6 +59,15 @@ stdenv.mkDerivation (finalAttrs: {
    "dev"
  ];

  patches = [
    # upstream patch; remove with next upgrade.
    (fetchpatch {
      name = "pmix-509-compatability.patch";
      url = "https://github.com/SchedMD/slurm/commit/be063f0c646d2bfe10d358fa7063f2b64e19e063.patch";
      hash = "sha256-QbKMBMl+VTLrzdXhPtcqwC7OcAXcJBxDS8jRZ2EoJL4=";
    })
  ];

  prePatch = ''
    substituteInPlace src/common/env.c \
        --replace "/bin/echo" "${lib.getExe' coreutils "echo"}"