Fixes from cross-examination

default.nix

@@ -46,10 +46,7 @@ with pkgs; with python3.pkgs; buildPythonPackage rec {
 
   src = gitignore-src.gitignoreSource ./.;
 
-  buildInputs = [
-    ruby
-    tcl
-  ];
+  buildInputs = [];
 
   includedTools = [
     (yosys.withPlugins([
@@ -64,6 +61,7 @@ with pkgs; with python3.pkgs; buildPythonPackage rec {
     magic
     verilog
     verilator
+    tcl
   ];
 
   propagatedBuildInputs = [

docker.nix

@@ -13,7 +13,7 @@
 # limitations under the License.
 {
     pkgs ? import ./nix/pkgs.nix {},
-    openlane ? import ./. {},
+    openlane ? import ./. { inherit pkgs; },
     name ? "ghcr.io/efabless/openlane2",
     tag-override ? null
 }:

openlane/steps/step.py

@@ -574,8 +574,8 @@ def create_reproducible(
         :param include_pdk: Include PDK files. If set to false, Path pointing
             to PDK files will be prefixed with ``pdk_dir::`` instead of being
             copied.
-        :param _flatten: Creates a reproducible with a fat file structure.
-            For internal use only.
+        :param _flatten: Creates a reproducible with a flat (single-directory)
+            file structure. For internal use only.
         """
         # 0. Create Directories
         mkdirp(target_dir)

openlane/steps/verilator.py

@@ -159,7 +159,7 @@ def run(self, state_in: State, **kwargs) -> Tuple[ViewsUpdate, MetricsUpdate]:
                 if r"%Error-LATCH" in line or r"%Warning-LATCH" in line:
                     latch_count += 1
                 if r"%Error-NEEDTIMINGOPT" in line:
-                    timing_constructs = 1
+                    timing_constructs += 1
                 if match := exiting_rx.search(line):
                     errors_count = int(match[1])
 

shell.nix

@@ -32,6 +32,7 @@ with pkgs; mkShell {
     delta
     neovim
     gtkwave
+    coreutils
 
     # Docs + Testing
     jupyter