From a85fd13c21b3f635e58a7ce60303b970f23dd5ae Mon Sep 17 00:00:00 2001
From: Robert Jordens <rj@m-labs.hk>
Date: Thu, 25 Jan 2018 19:34:47 +0100
Subject: [PATCH] conda: bump misoc, close #905

* cherry-pick c9b36e35
* also pin migen as we don't do .dev tags anymore
---
 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 fbe987e4c..0c2832498 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.6
-    - misoc 0.8
+    - migen 0.6 py35_0+gitc6ffa44
+    - misoc 0.8 py35_54+gitcb8e314c
     - jesd204b 0.3
     - binutils-or1k-linux >=2.27
     - llvm-or1k 4.0.1