Pull up all-profiles

IntersectMBO · Aug 8, 2022 · 07686e2 · 07686e2
1 parent fdc2692
commit 07686e2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/nix/pkgs.nix b/nix/pkgs.nix
@@ -89,7 +89,7 @@ final: prev: with final; {
   docker-workbench-nix =
     { workbench ? pkgs.workbench, ... }@args: pkgs.callPackage ./workbench/docker.nix args;
 
-  all-profiles-json = (pkgs.callPackage ./workbench/supervisor.nix {}).all-profiles.JSON;
+  all-profiles-json = (workbench.all-profiles{ inherit (supervisord-workbench-nix) services-config; }).JSON;
 
   # An instance of the workbench, specialised to the supervisord backend and a profile,
   # that can be used with nix-shell or lorri.

diff --git a/nix/workbench/docker.nix b/nix/workbench/docker.nix
@@ -49,13 +49,10 @@ let
         };
     };
 
-  all-profiles =
-    workbench.all-profiles
-      { inherit (backend) services-config; };
 in
 {
   inherit cacheDir stateDir basePort;
   inherit workbench;
   inherit backend;
-  inherit all-profiles;
+  inherit services-config;
 }
diff --git a/nix/workbench/supervisor.nix b/nix/workbench/supervisor.nix
@@ -49,13 +49,10 @@ let
         };
     };
 
-  all-profiles =
-    workbench.all-profiles
-      { inherit (backend) services-config; };
 in
 {
   inherit cacheDir stateDir basePort;
   inherit workbench;
   inherit backend;
-  inherit all-profiles;
+  inherit services-config;
 }