From 2fda9ad81cc89465b04624226ba7d226327bff01 Mon Sep 17 00:00:00 2001 From: Mohamed Gaber Date: Sat, 2 Nov 2024 13:53:29 +0200 Subject: [PATCH] hotfix: compilation failure --- Sources/Fault/Entries/chain.swift | 4 +--- flake.nix | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Sources/Fault/Entries/chain.swift b/Sources/Fault/Entries/chain.swift index 974293a..12e3dfd 100644 --- a/Sources/Fault/Entries/chain.swift +++ b/Sources/Fault/Entries/chain.swift @@ -599,8 +599,6 @@ extension Fault { let output = output ?? file.replacingExtension(".nl.v", with: ".chained.v") let intermediate = output.replacingExtension(".chained.v", with: ".chain-intermediate.v") - let includeFiles = Set(inc?.components(separatedBy: ",").filter { !$0.isEmpty } ?? []) - // MARK: Importing Python and Pyverilog let parse = Python.import("pyverilog.vparser.parser").parse @@ -729,7 +727,7 @@ extension Fault { // MARK: Verification if let model = cellModel { - let models = [model] + Array(includeFiles) + Array(blackboxModels) + let models = [model] + Array(includes) + Array(blackboxModels) print("Verifying scan chain integrity…") let ast = parse([netlist])[0] diff --git a/flake.nix b/flake.nix index f71a029..44ce1b1 100644 --- a/flake.nix +++ b/flake.nix @@ -68,7 +68,7 @@ ]; PYTHON_LIBRARY = "${pyenv}/lib/lib${python3.libPrefix}${stdenvNoCC.hostPlatform.extensions.sharedLibrary}"; - PYTHONPATH = "${pyenv}/${pyenv.sitePackages}"; + NIX_PYTHONPATH = "${pyenv}/${pyenv.sitePackages}"; FAULT_IVL_BASE = "${verilog}/lib/ivl"; }); }