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

Merge pull request #15780 from joachifm/slurm-refactor

Browse Source 
Slurm refactorings
This commit is contained in:
Arseniy Seroka 2016-05-28 21:25:43 +03:00
commit bb0d8b5519
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/services/computing/slurm/slurm.nix
View File

@ -40,7 +40,7 @@ in
defaultText = "pkgs.slurm-llnl"; defaultText = "pkgs.slurm-llnl";
example = literalExample "pkgs.slurm-llnl-full"; example = literalExample "pkgs.slurm-llnl-full";
description = '' 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" '' builder = pkgs.writeText "builder.sh" ''
source $stdenv/setup source $stdenv/setup
mkdir -p $out/bin 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 do
exename="$(basename $EXE)" exename="$(basename $EXE)"
wrappername="$out/bin/$exename" wrappername="$out/bin/$exename"

6
pkgs/servers/computing/slurm/default.nix
View File

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