From de57ab52a839ffbd5eee90aca29d6042b4911ed2 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Wed, 6 Feb 2019 11:41:23 +1100 Subject: qsub: rename flags to qsubFlags to avoid collision --- lib/qsub.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/qsub.nix b/lib/qsub.nix index 85036fb..235aa80 100644 --- a/lib/qsub.nix +++ b/lib/qsub.nix @@ -2,7 +2,7 @@ with lib; -{ ppn, mem, walltime, queue ? null, flags ? null, tmpDir, sleepTime}: drv: lib.overrideDerivation drv ({ args, builder, name, ... }: { +{ ppn, mem, walltime, queue ? null, qsubFlags ? null, tmpDir, sleepTime}: drv: lib.overrideDerivation drv ({ args, builder, name, ... }: { builder = "/bin/bash"; args = let script = writeScript "qsub-script" '' @@ -32,7 +32,7 @@ with lib; qsub -l nodes=1:ppn=${toString ppn},mem=${toString mem}gb,walltime=${walltime} \ -N "${name}" \ ${optionalString (queue != null) "-q ${queue}"} \ - ${optionalString (flags != null) flags} \ + ${optionalString (qsubFlags != null) qsubFlags} \ ${script} 2>&1 > id if [ $? -eq 0 ] ; then break -- cgit v1.2.3