workbench: remove duplicate code/file

IntersectMBO · Nov 30, 2022 · 169d114 · 169d114
1 parent 68087d4
commit 169d114
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 168 deletions.
diff --git a/nix/pkgs.nix b/nix/pkgs.nix
@@ -88,16 +88,10 @@ final: prev: with final; {
   # See https://input-output-hk.github.io/haskell.nix/user-guide/development/
   workbench-instance =
     let backendRegistry =
-          {
-            supervisor = {
-              backend-workbench = ./workbench/backend/supervisor.nix;
-              workbench-runner  = ./workbench/backend/supervisor-run.nix;
-            };
-            nomad = {
-              backend-workbench = ./workbench/backend/nomad.nix;
-              workbench-runner  = ./workbench/backend/nomad-run.nix;
-            };
-          };
+        {
+            supervisor = ./workbench/backend/supervisor.nix;
+            nomad = ./workbench/backend/nomad.nix;
+        };
     in
     { backendName
     , profileName           ? customConfig.localCluster.profileName
@@ -106,10 +100,11 @@ final: prev: with final; {
     , workbenchDevMode      ? false
     , profiled              ? false
     , workbench             ? pkgs.workbench
-    , backendWorkbench      ? pkgs.callPackage (backendRegistry."${backendName}".backend-workbench) { inherit useCabalRun workbench; }
+    , backendWorkbench      ? pkgs.callPackage (backendRegistry."${backendName}")
+        { inherit useCabalRun workbench; }
     , cardano-node-rev      ? null
     }:
-    pkgs.callPackage (backendRegistry."${backendName}".workbench-runner)
+    pkgs.callPackage ./workbench/backend/run.nix
       {
         inherit batchName profileName backendWorkbench cardano-node-rev;
       };

diff --git a/nix/workbench/backend/nomad-run.nix b/nix/workbench/backend/nomad-run.nix
diff --git a/nix/workbench/backend/supervisor-run.nix → nix/workbench/backend/run.nix b/nix/workbench/backend/supervisor-run.nix → nix/workbench/backend/run.nix
@@ -17,6 +17,8 @@ let
 
   backendName = backendWorkbench.backend.name;
 
+  useCabalRun = backendWorkbench.backend.useCabalRun;
+
   with-backend-profile =
     { envArgsOverride ? {} }: ## TODO: envArgsOverride is not used!
     workbench.with-profile
@@ -47,7 +49,7 @@ in
         --profile      ${profile} \
         --cache-dir    ${cacheDir} \
         --base-port    ${toString basePort} \
-        ''${WB_MODE_CABAL:+--cabal} \
+        ${pkgs.lib.optionalString useCabalRun ''--cabal \''}
         "$@"
     '';
 
@@ -87,10 +89,12 @@ in
               moreutils
               nixWrapped
               pstree
-              python3Packages.supervisor
               workbench.workbench
               zstd
-            ];
+            ]
+            ++
+            backendWorkbench.backend.extraShellPkgs
+            ;
           }
             ''
             mkdir -p    $out/{cache,nix-support}