From 5d5c66513a893b3c995b684c3bdba303f4840302 Mon Sep 17 00:00:00 2001 From: Federico Mastellone Date: Tue, 2 Aug 2022 17:03:50 +0000 Subject: [PATCH] Pull up all-profiles --- nix/pkgs.nix | 2 +- nix/workbench/supervisor.nix | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/nix/pkgs.nix b/nix/pkgs.nix index c0c4b598d76..505991f45f0 100644 --- 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 index 669836501aa..5fb446f517c 100644 --- 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; }