gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/slurm: fix wrapper script variable expansion, and refactor (#470374)

Browse Source
This commit is contained in:
Aleksana
2025-12-18 17:34:46 +00:00
committed by GitHub
parent 4911c532b1 96b408c71b
commit 8c009d6553
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/computing/slurm/slurm.nix
+20 -24
View File
@@ -336,31 +336,27 @@ in
config =
let
wrappedSlurm = pkgs.stdenv.mkDerivation {
name = "wrappedSlurm";
wrappedSlurm = pkgs.runCommand "wrappedSlurm" { } ''
mkdir -p $out/bin
find ${lib.getBin cfg.package}/bin -type f -executable | while read EXE
do
exename="$(basename $EXE)"
wrappername="$out/bin/$exename"
cat > "$wrappername" <<EOT
#!/bin/sh
if [ -z "\$SLURM_CONF" ]
then
SLURM_CONF="${cfg.etcSlurm}/slurm.conf" "$EXE" "\$@"
else
"$EXE" "\$0"
fi
EOT
chmod +x "$wrappername"
done
builder = pkgs.writeText "builder.sh" ''
mkdir -p $out/bin
find ${lib.getBin cfg.package}/bin -type f -executable | while read EXE
do
exename="$(basename $EXE)"
wrappername="$out/bin/$exename"
cat > "$wrappername" <<EOT
#!/bin/sh
if [ -z "$SLURM_CONF" ]
then
SLURM_CONF="${cfg.etcSlurm}/slurm.conf" "$EXE" "\$@"
else
"$EXE" "\$0"
fi
EOT
chmod +x "$wrappername"
done
mkdir -p $out/share
ln -s ${lib.getBin cfg.package}/share/man $out/share/man
'';
};
mkdir -p $out/share
ln -s ${lib.getBin cfg.package}/share/man $out/share/man
'';
in
lib.mkIf (cfg.enableStools || cfg.client.enable || cfg.server.enable || cfg.dbdserver.enable) {