workbench: build fix

IntersectMBO · Mar 15, 2022 · 2151fd1 · 2151fd1
1 parent 75a0b3a
commit 2151fd1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/nix/workbench/profiles/derived.jq b/nix/workbench/profiles/derived.jq
@@ -128,7 +128,7 @@ def add_derived_params:
          , cluster_startup_overhead_s:
                 (($gsis.utxo + $gsis.delegators) as $dataset_size
                 | if $dataset_size < 10000 then 5
-                  else $dataset_size / 20000
+                  else $dataset_size / 10000
                   end)
          }
      }

diff --git a/nix/workbench/shell.nix b/nix/workbench/shell.nix
@@ -1,4 +1,5 @@
-{ workbenchDevMode ? false
+{ lib
+, workbenchDevMode ? false
 , useCabalRun ? false
 , checkoutWbMode ? "unknown"
 }:

diff --git a/nix/workbench/tests/default.nix b/nix/workbench/tests/default.nix
@@ -1,9 +1,9 @@
 { pkgs
 }: let
-  inherit (pkgs) workbench-supervisord cardano-cli cardanolib-py cardano-node;
+  inherit (pkgs) supervisord-workbench-for-profile cardano-cli cardanolib-py cardano-node;
   stateDir = "./state-cluster-test";
   # We want a really short duration for tests
-  cluster' = workbench-supervisord {
+  cluster' = supervisord-workbench-for-profile {
     genesisParams = {
       slotLength = 0.1;
       decentralisationParam = 0.8;

diff --git a/shell.nix b/shell.nix
@@ -47,7 +47,7 @@ let
   haveGlibcLocales = pkgs.glibcLocales != null && stdenv.hostPlatform.libc == "glibc";
 
   shell =
-    let cluster = pkgs.workbench-supervisord
+    let cluster = pkgs.supervisord-workbench-for-profile
       { inherit profileName;
         useCabalRun = true;
       };
@@ -107,7 +107,8 @@ let
     shellHook = ''
       echo 'nix-shell top-level shellHook:  withHoogle=${toString withHoogle} profileName=${profileName} autoStartCluster=${toString autoStartCluster} workbenchDevMode=${toString workbenchDevMode}'
 
-      ${(import ./nix/workbench/shell.nix { inherit workbenchDevMode useCabalRun; }).shellHook}
+      ${with customConfig.localCluster;
+        (import ./nix/workbench/shell.nix { inherit lib workbenchDevMode; useCabalRun = true; }).shellHook}
 
       ${lib.optionalString autoStartCluster ''
       function atexit() {
@@ -133,7 +134,7 @@ let
   };
 
   devops =
-    let cluster = pkgs.workbench-supervisord
+    let cluster = pkgs.supervisord-workbench-for-profile
       { profileName = "devops-alzo";
         useCabalRun = false;
       };
@@ -171,7 +172,8 @@ let
 
       wb explain-mode
 
-      ${(import ./nix/workbench/shell.nix { inherit workbenchDevMode useCabalRun; }).shellHook}
+      ${with customConfig.localCluster;
+        (import ./nix/workbench/shell.nix { inherit lib workbenchDevMode; useCabalRun = false; }).shellHook}
 
       # Socket path default to first node launched by "start-cluster":
       export CARDANO_NODE_SOCKET_PATH=$(wb backend get-node-socket-path ${cluster.stateDir})