From b1e967c8a7eccfcb871e4617ce60e40e9f0aa5fd Mon Sep 17 00:00:00 2001 From: Federico Mastellone Date: Fri, 5 Aug 2022 15:03:13 +0000 Subject: [PATCH] Backend folder --- nix/pkgs.nix | 8 ++++---- nix/workbench/{profiles => backend}/services-config.nix | 0 nix/workbench/{ => backend}/supervisor-conf.nix | 0 nix/workbench/{ => backend}/supervisor-run.nix | 0 nix/workbench/{ => backend}/supervisor.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename nix/workbench/{profiles => backend}/services-config.nix (100%) rename nix/workbench/{ => backend}/supervisor-conf.nix (100%) rename nix/workbench/{ => backend}/supervisor-run.nix (100%) rename nix/workbench/{ => backend}/supervisor.nix (86%) diff --git a/nix/pkgs.nix b/nix/pkgs.nix index 5c850d09010..76d5b443fff 100644 --- a/nix/pkgs.nix +++ b/nix/pkgs.nix @@ -80,9 +80,9 @@ final: prev: with final; { workbench = pkgs.callPackage ./workbench {}; supervisord-workbench-cabal = - { workbench ? pkgs.workbench, ... }@args: pkgs.callPackage ./workbench/supervisor.nix (args // { useCabalRun = true; }); + { workbench ? pkgs.workbench, ... }@args: pkgs.callPackage ./workbench/backend/supervisor.nix (args // { useCabalRun = true; }); supervisord-workbench-nix = - { workbench ? pkgs.workbench, ... }@args: pkgs.callPackage ./workbench/supervisor.nix args; + { workbench ? pkgs.workbench, ... }@args: pkgs.callPackage ./workbench/backend/supervisor.nix args; all-profiles-json = (workbench.all-profiles{ inherit (supervisord-workbench-nix) backend; }).JSON; @@ -95,10 +95,10 @@ final: prev: with final; { , useCabalRun ? false , workbenchDevMode ? false , profiled ? false - , supervisord-workbench ? pkgs.callPackage ./workbench/supervisor.nix { inherit useCabalRun; } + , supervisord-workbench ? pkgs.callPackage ./workbench/backend/supervisor.nix { inherit useCabalRun; } , cardano-node-rev ? null }: - pkgs.callPackage ./workbench/supervisor-run.nix + pkgs.callPackage ./workbench/backend/supervisor-run.nix { inherit batchName profileName supervisord-workbench cardano-node-rev; }; diff --git a/nix/workbench/profiles/services-config.nix b/nix/workbench/backend/services-config.nix similarity index 100% rename from nix/workbench/profiles/services-config.nix rename to nix/workbench/backend/services-config.nix diff --git a/nix/workbench/supervisor-conf.nix b/nix/workbench/backend/supervisor-conf.nix similarity index 100% rename from nix/workbench/supervisor-conf.nix rename to nix/workbench/backend/supervisor-conf.nix diff --git a/nix/workbench/supervisor-run.nix b/nix/workbench/backend/supervisor-run.nix similarity index 100% rename from nix/workbench/supervisor-run.nix rename to nix/workbench/backend/supervisor-run.nix diff --git a/nix/workbench/supervisor.nix b/nix/workbench/backend/supervisor.nix similarity index 86% rename from nix/workbench/supervisor.nix rename to nix/workbench/backend/supervisor.nix index 44128321e47..51ccbdfbe7e 100644 --- a/nix/workbench/supervisor.nix +++ b/nix/workbench/backend/supervisor.nix @@ -20,7 +20,7 @@ let rec { name = "supervisor"; - services-config = import ./profiles/services-config.nix {inherit lib workbench basePort stateDir useCabalRun enableEKG;}; + services-config = import ./services-config.nix {inherit lib workbench basePort stateDir useCabalRun enableEKG;}; ## Backend-specific Nix bits: ## mkBackendConf :: Profile -> SupervisorConf/DockerConf