From d52568e254ddeb5e29efb4d2f15f8b538a025d0f Mon Sep 17 00:00:00 2001
From: Robert Jordens <rj@m-labs.hk>
Date: Mon, 15 Jan 2018 16:41:24 +0100
Subject: [PATCH] conda: bump migen (kasli link_up)

---
 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 4c31746dc..76031427b 100644
--- a/conda/artiq-dev/meta.yaml
+++ b/conda/artiq-dev/meta.yaml
@@ -15,7 +15,7 @@ requirements:
     - python >=3.5.3,<3.6
     - setuptools 33.1.1
     - migen 0.6.dev py35_64+gitc6ffa44
-    - misoc 0.8 py35_12+git172a6c87
+    - misoc 0.8 py35_14+git97f1b8a6
     - jesd204b 0.4
     - microscope
     - binutils-or1k-linux >=2.27