wb | do not pass around both pkgs and lib

Author: fmaste

nix/pkgs.nix

@@ -8,7 +8,7 @@ let
   inherit (prev) customConfig;
   # Parametrized helper entrypoint for the workbench development environment.
   workbench = import ./workbench
-    { inherit pkgs lib;
+    { inherit pkgs;
       haskellProject = final.cardanoNodeProject;
     }
   ;

nix/workbench/backend/nomad-job.nix

@@ -4,7 +4,6 @@
 # To make it easier to improve and debug the almighty workbench!
 ################################################################################
 { pkgs
-, lib
 , stateDir
 , profileBundle
 , generatorTaskName
@@ -15,6 +14,8 @@
 
 let
 
+  inherit (pkgs) lib;
+
   profile = profileBundle.profile.value;
 
   # Filesystem
@@ -737,7 +738,7 @@ let
               destination = "local/${task_supervisord_conf}";
               data = escapeTemplate (
                 import ./supervisor-conf.nix
-                  { inherit pkgs lib stateDir;
+                  { inherit pkgs stateDir;
                     inherit profile;
                     profiling = "none";
                     # Include only this taks' node

nix/workbench/backend/nomad.nix

@@ -1,12 +1,13 @@
 { pkgs
-, lib
 , haskellProject
 , stateDir
 , subBackendName
 , ...
 }:
 let
 
+  inherit (pkgs) lib;
+
   # Backend-specific Nix bits:
   materialise-profile = { profileBundle }:
     # Intermediate / workbench-adhoc container specifications
@@ -192,15 +193,15 @@ let
         exec = {
           # TODO: oneTracerPerGroup
           oneTracerPerCluster = import ./nomad-job.nix
-            { inherit pkgs lib stateDir;
+            { inherit pkgs stateDir;
               inherit profileBundle;
               inherit generatorTaskName;
               inherit installables;
               oneTracerPerNode = false;
               withSsh = false;
             };
           oneTracerPerNode = import ./nomad-job.nix
-            { inherit pkgs lib stateDir;
+            { inherit pkgs stateDir;
               inherit profileBundle;
               inherit generatorTaskName;
               inherit installables;
@@ -215,15 +216,15 @@ let
           # Always "oneTracerPerNode"
           # TODO: oneTracerPerCluster and oneTracerPerGroup
           nomadExec = import ./nomad-job.nix
-            { inherit pkgs lib stateDir;
+            { inherit pkgs stateDir;
               inherit profileBundle;
               inherit generatorTaskName;
               inherit installables;
               oneTracerPerNode = true;
               withSsh = false;
             };
           ssh = import ./nomad-job.nix
-            { inherit pkgs lib stateDir;
+            { inherit pkgs stateDir;
               inherit profileBundle;
               inherit generatorTaskName;
               inherit installables;

nix/workbench/backend/nomad/cloud.nix

@@ -1,5 +1,4 @@
 { pkgs
-, lib
 , haskellProject
 , stateDir
 , basePort     # ignored, just passed to the runner (unlike `supervisor.nix`).
@@ -40,7 +39,7 @@ let
   # Build a Nomad Job specification for this Nomad "sub-backend".
   materialise-profile =
     let params = {
-      inherit pkgs lib;
+      inherit pkgs;
       inherit haskellProject;
       inherit stateDir;
       subBackendName = "cloud";

nix/workbench/backend/nomad/exec.nix

@@ -1,5 +1,4 @@
 { pkgs
-, lib
 , haskellProject
 , stateDir
 , basePort     # ignored, just passed to the runner (unlike `supervisor.nix`).
@@ -38,7 +37,7 @@ let
   # Build a Nomad Job specification for this Nomad "sub-backend".
   materialise-profile =
     let params = {
-      inherit pkgs lib;
+      inherit pkgs;
       inherit haskellProject;
       inherit stateDir;
       subBackendName = "exec";

nix/workbench/backend/runner.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib
+{ pkgs
 ## The binaries/scripts to use when calling the workbench.
 , haskellProject
 , workbench # The derivation.
@@ -56,7 +56,7 @@ let
     fi
     export CARDANO_NODE_SOCKET_PATH=${stateDir}/node-0/node.socket
     ''
-    + lib.optionalString (profileBundle.profile.value.scenario == "chainsync") (
+    + pkgs.lib.optionalString (profileBundle.profile.value.scenario == "chainsync") (
       let cardano-mainnet-mirror =
             # "nix" branch last commit 819488be9eabbba6aaa7c931559bc584d8071e3d
             __getFlake "github:input-output-hk/cardano-mainnet-mirror/nix";

nix/workbench/backend/supervisor-conf.nix

@@ -1,5 +1,4 @@
 { pkgs
-, lib
 , stateDir
 , profile
 , profiling
@@ -11,9 +10,10 @@
 , inetHttpServerPort ? null
 }:
 
-with lib;
-
 let
+
+  inherit (pkgs) lib;
+
   # The prefix for every "[program:X] command=sh start.sh" because `supervisord`
   # may run in the most unexpected places where we can't asume what is or isn't
   # included in $PATH. Just make sure pkgs.bashInteractive is in the nix store.
@@ -255,4 +255,4 @@ let
     ;
 
 in
-  generators.toINI {} supervisorConf
+  lib.generators.toINI {} supervisorConf

nix/workbench/backend/supervisor.nix

@@ -1,13 +1,12 @@
 { pkgs
-, lib
 , haskellProject
 , stateDir
 , basePort
 , useCabalRun
 , profiling
 , ...
 }:
-with lib;
+with pkgs.lib;
 let
   extraShellPkgs = with pkgs;
     [
@@ -22,7 +21,7 @@ let
       "workbench-backend-data-${profileBundle.profile.value.name}-supervisor"
       { # Create a `supervisord.conf`
         supervisorConf = import ./supervisor-conf.nix
-        { inherit pkgs lib stateDir;
+        { inherit pkgs stateDir;
           profile = profileBundle.profile.value;
           inherit profiling;
           nodeSpecs = profileBundle.node-specs.value;

nix/workbench/default.nix

@@ -1,5 +1,5 @@
 # The workbench entrypoint,
-{ pkgs, lib
+{ pkgs
   # This provided project attrset will be used all over the workbench instead
   # of the flake's `pkgs` or `cardanoNodePackages`. This allows to easily
   # parametrize the whole build at any point, be it only for the workbench in
@@ -14,10 +14,10 @@
 , haskellProject
 }:
 
-with lib;
-
 let
 
+  inherit (pkgs) lib;
+
   # Workbench derivation to create derivations from `wb` commands.
   ##############################################################################
 
@@ -43,7 +43,7 @@ let
                 profile  = [".sh" ".json"];
                 topology = [".sh"];
               };
-          in  lib.any id [
+          in  lib.any lib.id [
             # Include the "wb" file (has no ".sh", workbench's entrypoint).
             (relativePath == "wb")
             # Include all top level "*.sh" files.
@@ -61,8 +61,8 @@ let
                 )
             )
             # Include only the extensions defined above.
-            (lib.any id
-              (lib.attrValues (mapAttrs
+            (lib.any lib.id
+              (lib.attrValues (lib.mapAttrs
                 (dirName: suffixes:
                      (lib.hasPrefix (dirName + "/") relativePath)
                   &&
@@ -108,7 +108,7 @@ let
 # Output
 ################################################################################
 
-in pkgs.lib.fix (self: {
+in lib.fix (self: {
 
   inherit workbench;
   inherit haskellProject;
@@ -118,7 +118,7 @@ in pkgs.lib.fix (self: {
   # profileName -> profile
   profile = profileName:
     (import ./profile/profile.nix
-      { inherit pkgs lib;
+      { inherit pkgs;
         workbenchNix = self;
         inherit profileName;
       }
@@ -143,7 +143,7 @@ in pkgs.lib.fix (self: {
      , profiling
      }:
       (backendRegistry."${backendName}")
-        { inherit pkgs lib;
+        { inherit pkgs;
           inherit haskellProject;
           inherit stateDir basePort;
           # The `useCabalRun` and `profiling` flags are set in the backend to
@@ -187,7 +187,7 @@ in pkgs.lib.fix (self: {
         ;
     in import ./backend/runner.nix
       {
-          inherit pkgs lib;
+          inherit pkgs;
           inherit haskellProject;
           inherit workbench;
           inherit profile backend;

nix/workbench/profile/profile.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib
+{ pkgs
 # The workbench attrset as it was parametrized.
 , workbenchNix
 , profileName