conda: bump migen, misoc

* reset_less Cordic * Signal.like() inherits more * address decoder changes
2017-06-28 20:56:43 +02:00 · 2017-06-28 20:56:43 +02:00 · 6fad15c532
parent 3cbbcdfe96
commit 6fad15c532
1 changed files with 2 additions and 2 deletions
--- a/conda/artiq-dev/meta.yaml
+++ b/conda/artiq-dev/meta.yaml
@ -14,8 +14,8 @@ requirements:
  run:
    - python >=3.5.3,<3.6
    - setuptools 33.1.1
-    - migen 0.5.dev py_101+git5ccee6c
-    - misoc 0.6.dev py_17+git2d3f62f
+    - migen 0.5.dev py_104+git1ac783f
+    - misoc 0.6.dev py_21+git1d3fbc4e
    - jesd204b 0.3
    - binutils-or1k-linux >=2.27
    - llvm-or1k