From 1de2da5644359e81574bd6f64a6b34eb2f440324 Mon Sep 17 00:00:00 2001
From: Robert Jordens <rj@m-labs.hk>
Date: Mon, 26 Feb 2018 14:16:05 +0100
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 bbde80b94..7d50b6684 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_8+giteeccd1a
-    - misoc 0.9 py35_14+gitd26c07ae
+    - migen 0.7 py35_10+git0996e0b
+    - misoc 0.9 py35_20+git5fed1095
     - jesd204b 0.5
     - microscope
     - binutils-or1k-linux >=2.27