From 96656876e78bc5a81a9b45871229a41072f3d19a Mon Sep 17 00:00:00 2001 From: Federico Mastellone Date: Thu, 12 Sep 2024 16:34:09 +0000 Subject: [PATCH] wb | rename pkgs version of `workbench-runner` accordingly --- flake.nix | 2 +- nix/pkgs.nix | 4 ++-- shell.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 4052b906485..a59a05e4800 100644 --- a/flake.nix +++ b/flake.nix @@ -189,7 +189,7 @@ // optionalAttrs (system == "x86_64-linux") (let workbenchTest = { profileName, workbenchStartArgs ? [] }: - (pkgs.workbench-runner + (pkgs.custom-config-workbench-runner { inherit profileName workbenchStartArgs; backendName = "supervisor"; diff --git a/nix/pkgs.nix b/nix/pkgs.nix index 0ac0108fda6..89bf8bbabfd 100644 --- a/nix/pkgs.nix +++ b/nix/pkgs.nix @@ -11,7 +11,7 @@ let {inherit pkgs lib; inherit (final) cardanoNodePackages cardanoNodeProject;}; # Workbench runner instantiated by parameters from customConfig: - workbench-runner = + custom-config-workbench-runner = { stateDir ? customConfig.localCluster.stateDir , batchName ? customConfig.localCluster.batchName , profileName ? customConfig.localCluster.profileName @@ -35,7 +35,7 @@ in with final; { inherit (cardanoNodeProject.args) compiler-nix-name; - inherit workbench workbench-runner; + inherit workbench custom-config-workbench-runner; cabal = haskell-nix.cabal-install.${compiler-nix-name}; diff --git a/shell.nix b/shell.nix index 6857cfbef7d..73cede3d48c 100644 --- a/shell.nix +++ b/shell.nix @@ -77,7 +77,7 @@ let inherit cardano-mainnet-mirror; inherit workbenchDevMode; inherit withHoogle; - workbench-runner = pkgs.workbench-runner + workbench-runner = pkgs.custom-config-workbench-runner { inherit profileName backendName useCabalRun; profiling = profilingEff; }; @@ -85,7 +85,7 @@ let devops = let profileName = "devops-bage"; - workbench-runner = pkgs.workbench-runner + workbench-runner = pkgs.custom-config-workbench-runner { inherit profileName; backendName = "supervisor";