From 44277c5b7e6e1082ed97d9e88e75fd77253b88ce Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sun, 11 Mar 2018 10:11:42 +0800
Subject: [PATCH] conda: bump migen/misoc

---
 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 12b6e1f84..c1143ee16 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_19+git96f2fa6
-    - misoc 0.9 py35_37+gitf051a1f2
+    - migen 0.7 py35_20+git1f82faa
+    - misoc 0.10 py35_0+gitd167deff
     - jesd204b 0.5
     - microscope
     - binutils-or1k-linux >=2.27