Revert extraction in ececb59

IntersectMBO · Aug 8, 2022 · 83a4f7d · 83a4f7d
1 parent ea63e99
commit 83a4f7d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/nix/workbench/backend/docker.nix b/nix/workbench/backend/docker.nix
@@ -22,6 +22,14 @@ let
 
       services-config = import ./services-config.nix {inherit lib workbench basePort stateDir useCabalRun enableEKG;};
 
+      materialise-profile =
+        { profileNix }:
+          pkgs.runCommand "workbench-profile-outputs-${profileNix.name}-${name}d" {}
+            ''
+            mkdir $out
+            cp ${mkBackendConf profileNix} $out/docker.conf
+            '';
+
       ## Backend-specific Nix bits:
       ## mkBackendConf :: Profile -> SupervisorConf/DockerConf
       mkBackendConf =

diff --git a/nix/workbench/backend/supervisor.nix b/nix/workbench/backend/supervisor.nix
@@ -22,6 +22,14 @@ let
 
       services-config = import ./services-config.nix {inherit lib workbench basePort stateDir useCabalRun enableEKG;};
 
+      materialise-profile =
+        { profileNix }:
+          pkgs.runCommand "workbench-profile-outputs-${profileNix.name}-${name}d" {}
+            ''
+            mkdir $out
+            cp ${mkBackendConf profileNix} $out/supervisor.conf
+            '';
+
       ## Backend-specific Nix bits:
       ## mkBackendConf :: Profile -> SupervisorConf/DockerConf
       mkBackendConf =

diff --git a/nix/workbench/default.nix b/nix/workbench/default.nix
@@ -107,12 +107,7 @@ let
 
       profile = materialise-profile
         { inherit profileNix workbench;
-          backendProfile =
-            pkgs.runCommand "workbench-profile-outputs-${profileNix.name}-${backend.name}d" {}
-              ''
-              mkdir $out
-              cp ${backend.mkBackendConf profileNix} $out/${backend.name}.conf
-              '';
+          backendProfile = backend.materialise-profile { inherit profileNix; };
         };
 
       topology = profile-topology { inherit profileNix profile; };