From 86bb43d97063713e6b1ba24d7590b10854551adb Mon Sep 17 00:00:00 2001 From: Federico Mastellone Date: Mon, 9 Mar 2026 14:59:26 +0000 Subject: [PATCH] wb | fix for non-flake workbench creation using incorrect haskell project Fixes nix / useCabalRun=false profiles with profiling enabled See #6380 --- shell.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/shell.nix b/shell.nix index 99182a7b604..06bbd7b2135 100644 --- a/shell.nix +++ b/shell.nix @@ -181,6 +181,10 @@ let haveGlibcLocales = pkgs.glibcLocales != null && stdenv.hostPlatform.libc == "glibc"; + workbench = import ./nix/workbench/default.nix + { inherit pkgs; haskellProject = project; } + ; + workbench-shell = with customConfig.localCluster; import ./nix/workbench/shell.nix @@ -188,21 +192,26 @@ let inherit setLocale haveGlibcLocales; inherit workbenchDevMode; inherit withHoogle; - workbench-runner = pkgs.workbench-runner + workbench-runner = workbench.runner { inherit profiling; - inherit profileName backendName useCabalRun; + inherit profileName backendName; + inherit useCabalRun; + inherit workbenchStartArgs cardano-node-rev; + inherit (customConfig.localCluster) stateDir basePort batchName; }; }; devops = let profileName = "devops-bage"; - workbench-runner = pkgs.workbench-runner + workbench-runner = workbench.runner { inherit profiling; inherit profileName; backendName = "supervisor"; useCabalRun = false; + inherit workbenchStartArgs cardano-node-rev; + inherit (customConfig.localCluster) stateDir basePort batchName; }; - devopsShell = with customConfig.localCluster; + devopsShell = import ./nix/workbench/shell.nix { inherit pkgs lib haskellLib project; inherit setLocale haveGlibcLocales;