From 6fad15c532348acf92040847caf48d37dbe56705 Mon Sep 17 00:00:00 2001
From: Robert Jordens <rj@m-labs.hk>
Date: Wed, 28 Jun 2017 20:56:43 +0200
Subject: [PATCH] conda: bump migen, misoc

* reset_less Cordic
* Signal.like() inherits more
* address decoder changes
---
 conda/artiq-dev/meta.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml
index 7e0e73797..7dd7941eb 100644
--- 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