From 49a265453d1874aaf69aa67db745b1f5dff1945b Mon Sep 17 00:00:00 2001
From: Robert Jordens <rj@m-labs.hk>
Date: Tue, 30 Jan 2018 11:03:55 +0100
Subject: [PATCH] conda: sync artiq and artiq-dev

c.f. 4c22d64e
---
 conda/artiq-dev/meta.yaml | 2 +-
 conda/artiq/meta.yaml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conda/artiq-dev/meta.yaml b/conda/artiq-dev/meta.yaml
index b3d722ba7..01ea06683 100644
--- a/conda/artiq-dev/meta.yaml
+++ b/conda/artiq-dev/meta.yaml
@@ -37,7 +37,7 @@ requirements:
     - python-dateutil
     - pyqt >=5.5
     - quamash
-    - pyqtgraph
+    - pyqtgraph 0.10.0
     - pygit2
     - aiohttp
     - pythonparser >=1.1
diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml
index 67d30ea82..6dcdaa336 100644
--- a/conda/artiq/meta.yaml
+++ b/conda/artiq/meta.yaml
@@ -27,7 +27,7 @@ requirements:
   run:
     - python >=3.5.3,<3.6
     - llvmlite-artiq 0.20.0
-    - binutils-or1k-linux
+    - binutils-or1k-linux >=2.27
     - pythonparser >=1.1
     - openocd ==0.10.0
     - lit