Skip to content

Commit b9fe845

Browse files
fmastemgmeier
authored andcommitted
wb | fix for non-flake workbench creation using incorrect haskell project
Fixes nix / useCabalRun=false profiles with profiling enabled See #6380
1 parent 2ad77f9 commit b9fe845

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

shell.nix

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,28 +181,37 @@ let
181181

182182
haveGlibcLocales = pkgs.glibcLocales != null && stdenv.hostPlatform.libc == "glibc";
183183

184+
workbench = import ./nix/workbench/default.nix
185+
{ inherit pkgs; haskellProject = project; }
186+
;
187+
184188
workbench-shell =
185189
with customConfig.localCluster;
186190
import ./nix/workbench/shell.nix
187191
{ inherit pkgs lib haskellLib project;
188192
inherit setLocale haveGlibcLocales;
189193
inherit workbenchDevMode;
190194
inherit withHoogle;
191-
workbench-runner = pkgs.workbench-runner
195+
workbench-runner = workbench.runner
192196
{ inherit profiling;
193-
inherit profileName backendName useCabalRun;
197+
inherit profileName backendName;
198+
inherit useCabalRun;
199+
inherit workbenchStartArgs cardano-node-rev;
200+
inherit (customConfig.localCluster) stateDir basePort batchName;
194201
};
195202
};
196203

197204
devops =
198205
let profileName = "devops-bage";
199-
workbench-runner = pkgs.workbench-runner
206+
workbench-runner = workbench.runner
200207
{ inherit profiling;
201208
inherit profileName;
202209
backendName = "supervisor";
203210
useCabalRun = false;
211+
inherit workbenchStartArgs cardano-node-rev;
212+
inherit (customConfig.localCluster) stateDir basePort batchName;
204213
};
205-
devopsShell = with customConfig.localCluster;
214+
devopsShell =
206215
import ./nix/workbench/shell.nix
207216
{ inherit pkgs lib haskellLib project;
208217
inherit setLocale haveGlibcLocales;

0 commit comments

Comments
 (0)