From 5cc1d2a1d3f05d65aedb372f49f6ec25509101eb Mon Sep 17 00:00:00 2001
From: Robert Jordens <rj@m-labs.hk>
Date: Wed, 7 Mar 2018 17:17:30 +0100
Subject: [PATCH] conda: bump migen, misoc

* flterm leak
* kasli version
* sayma ddram
* ethernet clocking
* fifo dout reset_less
---
 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 c3a5342be..11c332b64 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.7 py35_14+git8fcd67a
-    - misoc 0.9 py35_20+git5fed1095
+    - migen 0.7 py35_18+git90e4101
+    - misoc 0.9 py35_29+gitbf82a812
     - jesd204b 0.5
     - microscope
     - binutils-or1k-linux >=2.27