conda: sync artiq and artiq-dev

c.f. 4c22d64
m-labs · Jan 30, 2018 · 49a2654 · 49a2654
1 parent e1aafcb
commit 49a2654
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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