From e82405f0e8e4680aa6a39556810535e5c1d88487 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 11 Jun 2019 17:35:35 +1000 Subject: slurm: allow salloc path to be overridden in stage calls salloc was missing from defaults, preventing overriding of salloc path for each stage. --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'default.nix') diff --git a/default.nix b/default.nix index 54d0215..edb9377 100644 --- a/default.nix +++ b/default.nix @@ -38,7 +38,7 @@ let fastp = callBionix ./tools/fastp.nix {}; slurm = attrs: bionix.extend (self: super: with self; rec { - slurmDefs = { ppn = 1; mem = 1; walltime = "24:00:00"; partition = null; slurmFlags = null; } // attrs; + slurmDefs = { ppn = 1; mem = 1; walltime = "24:00:00"; partition = null; slurmFlags = null; salloc = "/usr/bin/salloc"; } // attrs; slurm = attrs: (callPackage ./lib/slurm.nix {}) (slurmDefs // attrs); exec = f: x: y: slurm (builtins.intersectAttrs slurmDefs x) (f (builtins.removeAttrs x (builtins.attrNames slurmDefs)) y); }); -- cgit v1.2.3