update to new revision nmigen

diff --git a/src/nmutil/nmoperator.py b/src/nmutil/nmoperator.py
index 87bc1898a44e852a24ec9576f0d714fb9a39d5c8..fd50d2f53e7c8292985752df7afffdefa4e04417 100644 (file)
--- a/src/nmutil/nmoperator.py
+++ b/src/nmutil/nmoperator.py
@@ -164,7 +164,7 @@ def shape(i):
 def cat(i):
     """ flattens a compound structure recursively using Cat
     """
-    from nmigen.tools import flatten
+    from nmigen._utils import flatten
     #res = list(flatten(i)) # works (as of nmigen commit f22106e5) HOWEVER...
     res = list(Visitor().iterate(i)) # needed because input may be a sequence
     return Cat(*res)

diff --git a/src/nmutil/queue.py b/src/nmutil/queue.py
index 069aa22cc33d8507a0644157e70bf0a39abbf450..3d47c6392f1bb0a70de66d2200fc6fd74853c66b 100644 (file)
--- a/src/nmutil/queue.py
+++ b/src/nmutil/queue.py
@@ -24,7 +24,7 @@
 # MODIFICATIONS.
 
 from nmigen import Module, Signal, Memory, Mux, Elaboratable
-from nmigen.tools import bits_for
+from nmigen.utils import bits_for
 from nmigen.cli import main
 from nmigen.lib.fifo import FIFOInterface