Pull up all-profiles

IntersectMBO · Aug 8, 2022 · 5d5c665 · 5d5c665
1 parent b89038c
commit 5d5c665
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/nix/pkgs.nix b/nix/pkgs.nix
@@ -84,7 +84,7 @@ final: prev: with final; {
   supervisord-workbench-nix =
     { workbench ? pkgs.workbench, ... }@args: pkgs.callPackage ./workbench/supervisor.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/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;
 }