Skip to content

wb | fix for non-flake workbench creation using incorrect haskell pro… #6480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fmaste wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −4
Draft

wb | fix for non-flake workbench creation using incorrect haskell pro… #6480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,28 +181,37 @@ 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
{ inherit pkgs lib haskellLib project;
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;
Expand Down
Loading