From 622b1b057b731c8e4308619bc8d525a22c53ea04 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 28 May 2016 01:29:42 +0200 Subject: [PATCH 1/3] slurm-llnl: multiple outputs --- pkgs/servers/computing/slurm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 95d6cd943fa..5d65e707fd5 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/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 = From c420d0fb289af2c233cf525a3a9ea17cb1c2790e Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 28 May 2016 01:30:02 +0200 Subject: [PATCH 2/3] slurm service: fix typo in option description --- nixos/modules/services/computing/slurm/slurm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index ad8836f4009..a45cbbb50d9 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/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. ''; }; From b05bb30361cf03c3b69f734fce7e3b76c9665175 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 28 May 2016 01:30:19 +0200 Subject: [PATCH 3/3] slurm service: robust reference to slurm bin output --- nixos/modules/services/computing/slurm/slurm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index a45cbbb50d9..ee38a42199e 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -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"