diff --git a/pkgs/index.nix b/pkgs/index.nix index 1d481a14..d8ac4977 100644 --- a/pkgs/index.nix +++ b/pkgs/index.nix @@ -42,6 +42,7 @@ let #pscom = callPackage ./parastation/pscom.nix { }; # Unmaintaned #psmpi = callPackage ./parastation/psmpi.nix { }; # Unmaintaned prometheus-slurm-exporter = prev.callPackage ./prometheus-slurm-exporter/default.nix { }; + slurm = callPackage ./slurm/default.nix { }; sonar = callPackage ./sonar/default.nix { }; stdenvClangOmpss2 = final.stdenv.override { cc = final.clangOmpss2; allowedRequisites = null; }; stdenvClangOmpss2Nanos6 = final.stdenv.override { cc = final.clangOmpss2Nanos6; allowedRequisites = null; }; diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix index 72c7b070..3f816834 100644 --- a/pkgs/overlay.nix +++ b/pkgs/overlay.nix @@ -1,21 +1,3 @@ final: prev: { - slurm = prev.slurm.overrideAttrs (old: { - patches = (old.patches or []) ++ [ - # See https://bugs.schedmd.com/show_bug.cgi?id=19324 - ./slurm-rank-expansion.patch - ]; - # Install also the pam_slurm_adopt library to restrict users from accessing - # nodes with no job allocated. - postBuild = (old.postBuild or "") + '' - pushd contribs/pam_slurm_adopt - make "PAM_DIR=$out/lib/security" - popd - ''; - postInstall = (old.postInstall or "") + '' - pushd contribs/pam_slurm_adopt - make "PAM_DIR=$out/lib/security" install - popd - ''; - }); } diff --git a/pkgs/slurm/default.nix b/pkgs/slurm/default.nix new file mode 100644 index 00000000..5e0a24c9 --- /dev/null +++ b/pkgs/slurm/default.nix @@ -0,0 +1,20 @@ +{ slurm }: + +slurm.overrideAttrs (old: { + patches = (old.patches or []) ++ [ + # See https://bugs.schedmd.com/show_bug.cgi?id=19324 + ./slurm-rank-expansion.patch + ]; + # Install also the pam_slurm_adopt library to restrict users from accessing + # nodes with no job allocated. + postBuild = (old.postBuild or "") + '' + pushd contribs/pam_slurm_adopt + make "PAM_DIR=$out/lib/security" + popd + ''; + postInstall = (old.postInstall or "") + '' + pushd contribs/pam_slurm_adopt + make "PAM_DIR=$out/lib/security" install + popd + ''; +}