Merge pull request #15780 from joachifm/slurm-refactor

Slurm refactorings

nixos/modules/services/computing/slurm/slurm.nix

@@ -40,7 +40,7 @@ in
         defaultText = "pkgs.slurm-llnl";
         example = literalExample "pkgs.slurm-llnl-full";
         description = ''
-          The packge to use for slurm binaries.
+          The package to use for slurm binaries.
         '';
       };
 
@@ -111,7 +111,7 @@ in
         builder = pkgs.writeText "builder.sh" ''
           source $stdenv/setup
           mkdir -p $out/bin
-          find  ${cfg.package}/bin -type f -executable | while read EXE
+          find  ${getBin cfg.package}/bin -type f -executable | while read EXE
           do
             exename="$(basename $EXE)"
             wrappername="$out/bin/$exename"

pkgs/servers/computing/slurm/default.nix

@@ -11,9 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1";
   };
 
+  outputs = [ "dev" "out" ];
+
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    pkgconfig curl python munge perl pam openssl mysql.lib ncurses gtk lua
-    hwloc numactl
+    curl python munge perl pam openssl mysql.lib ncurses gtk lua hwloc numactl
   ];
 
   configureFlags =