From c47006b1543579390dd07ed5da6eb601e5c1efcd Mon Sep 17 00:00:00 2001
From: Robert Jordens <rj@m-labs.hk>
Date: Wed, 6 Dec 2017 16:55:27 +0100
Subject: [PATCH] conda: bump migen

Relevant changes:

* Kasli
---
 conda/artiq-dev/meta.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml
index 570784db2..0654378d8 100644
--- a/conda/artiq-dev/meta.yaml
+++ b/conda/artiq-dev/meta.yaml
@@ -14,7 +14,7 @@ requirements:
   run:
     - python >=3.5.3,<3.6
     - setuptools 33.1.1
-    - migen 0.5
+    - migen 0.6.dev py35_40+gite63093b
     - misoc 0.7.dev py35_35+git9791213f
     - jesd204b 0.4
     - binutils-or1k-linux >=2.27