From d51294649e5b2486121b9c3952c18b5a3f76ffd0 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 10 Jul 2018 12:26:24 +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 a53b96a96..fbee12943 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_66+gitdcfec40
-    - misoc 0.11 py35_20+git2436a68d
+    - migen 0.7 py35_69+gitb515b0e
+    - misoc 0.11 py35_27+git37dfced7
     - jesd204b 0.7
     - microscope
     - binutils-or1k-linux >=2.27