Revert "wb | remove indirection / skip the workbench (bash)"

This reverts commit ec73d74e784a89ca4eef9af4ad036786c27a130c.
IntersectMBO · Sep 17, 2024 · c10a886 · c10a886
1 parent 8782427
commit c10a886
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/nix/workbench/default.nix b/nix/workbench/default.nix
@@ -63,27 +63,22 @@ let
       ${workbench}/bin/wb ${command} > $out
     '';
 
-  runCardanoProfile =
-    name: command:
-    pkgs.runCommand name {} ''
-      ${cardanoNodePackages.cardano-profile}/bin/cardano-profile ${command} > $out
-    '';
-
   runJq =
     name: args: query:
     pkgs.runCommand name {} ''
       args=(${args})
       ${pkgs.jq}/bin/jq '${query}' "''${args[@]}" > $out
     '';
 
-  profile-names-json = runCardanoProfile "profile-names.json" "names";
+  profile-names-json =
+    runWorkbench "profile-names.json" "profiles list";
 
-  profile-names = __fromJSON (__readFile profile-names-json);
+  profile-names =
+    __fromJSON (__readFile profile-names-json);
 
 in pkgs.lib.fix (self: {
   inherit cardanoNodePackages;
   inherit workbench' workbench runWorkbench;
-  inherit runCardanoProfile;
   inherit runJq;
 
   inherit profile-names-json profile-names;

diff --git a/nix/workbench/profile/profile.nix b/nix/workbench/profile/profile.nix
@@ -6,8 +6,8 @@
 
 let
   profileJson =
-    workbenchNix.runCardanoProfile "profile-${profileName}.json"
-      "by-name ${profileName}"
+    workbenchNix.runWorkbench "profile-${profileName}.json"
+      "profile json ${profileName}"
   ;
 
   topologyFiles =