refactor slurm implementation to allow for overlays

2 files changed, 15 insertions, 20 deletions

diff --git a/default.nix b/default.nix
index 0859085..2e98d6d 100644
--- a/default.nix
+++ b/default.nix
@@ -50,24 +50,18 @@ let
       whisper = callBionix ./tools/whisper.nix { };
       star = callBionix ./tools/star.nix { };
 
-      slurm = attrs:
-        bionix.extend (self: super:
-          with self; rec {
-            slurmDefs = {
-              ppn = 1;
-              mem = 1;
-              walltime = "24:00:00";
-              partition = null;
-              slurmFlags = null;
-              salloc = "/usr/bin/salloc";
-              srun = "/usr/bin/srun";
-            } // attrs;
-            slurm = attrs:
-              (callPackage ./lib/slurm.nix { }) (slurmDefs // attrs);
-            exec = f: x: y:
-              slurm (builtins.intersectAttrs slurmDefs x) (super.exec f
-                (builtins.removeAttrs x (builtins.attrNames slurmDefs)) y);
-          });
+      slurm-run = callPackage ./lib/slurm.nix { };
+      slurm-exec = f: x: y:
+        slurm-run x (f (builtins.removeAttrs x [
+          "ppn"
+          "mem"
+          "walltime"
+          "partition"
+          "slurmFlags"
+          "salloc"
+          "srun"
+        ]) y);
+      slurm = bionix.extend (self: super: { exec = super.slurm-run; });
       qsub = attrs:
         bionix.extend (self: super:
           with self; rec {
@@ -190,7 +184,8 @@ let
 
   overlayByType = {
     lambda = bionix: overlay:
-      bionix.extend overlay;
+      bionix.extend
+      (self: super: nixpkgs.lib.recursiveUpdate super (overlay self super));
     path = bionix: path: overlay bionix (import path);
   };
   overlay = bionix: overlay:
diff --git a/lib/slurm.nix b/lib/slurm.nix
index 4ad41ab..c050628 100644
--- a/lib/slurm.nix
+++ b/lib/slurm.nix
@@ -5,7 +5,7 @@ with lib;
 let escape = x: if builtins.typeOf x == "string" then escapeShellArg x else x;
 
 in { ppn, mem, walltime, partition ? null, slurmFlags ? null
-, salloc ? "/usr/bin/salloc", srun ? "/usr/bin/srun" }:
+, salloc ? "/usr/bin/salloc", srun ? "/usr/bin/srun", ... }:
 drv:
 let ppnReified = if drv.multicore then ppn else 1;
 in overrideDerivation drv ({ args, builder, name, ... }: {