From 472840f16bb1275a96f495800646a0d3e6bbf6c6 Mon Sep 17 00:00:00 2001
From: Robert Jordens <rj@m-labs.hk>
Date: Mon, 22 Jan 2018 20:32:18 +0100
Subject: [PATCH] conda: bump migen/misoc

* kasli clock constraint
* vivado false paths
---
 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 1a2dfb240..9a6eb79cb 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 py35_6+gita4df9c7
-    - misoc 0.8 py35_48+git45f957ab
+    - migen 0.6 py35_9+git4246d18
+    - misoc 0.8 py35_49+git9c343e1c
     - jesd204b 0.4
     - microscope
     - binutils-or1k-linux >=2.27