From bf50dcf76d9afa4d4943aa237767c129cb1ca2d1 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Tue, 20 Nov 2018 17:15:53 +0800
Subject: [PATCH] conda: use misoc release

---
 RELEASE_NOTES.rst         | 8 ++++++++
 conda/artiq-dev/meta.yaml | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/RELEASE_NOTES.rst b/RELEASE_NOTES.rst
index 37c7f7c203..b48faa7962 100644
--- a/RELEASE_NOTES.rst
+++ b/RELEASE_NOTES.rst
@@ -3,6 +3,14 @@
 Release notes
 =============
 
+ARTIQ-5
+-------
+
+5.0
+***
+
+
+
 ARTIQ-4
 -------
 
diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml
index 5b87fb0119..8212a62c14 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.8 py35_0+git2d62c0c
-    - misoc 0.11 py35_34+git714ea689
+    - misoc 0.12 py35_0+git714ea689
     - jesd204b 0.10
     - microscope
     - binutils-or1k-linux >=2.27