conda: sync artiq and artiq-dev

c.f. 4c22d64e
2018-01-30 11:03:55 +01:00 · 2018-01-30 11:03:55 +01:00 · 49a265453d
parent e1aafcbb4f
commit 49a265453d
2 changed files with 2 additions and 2 deletions
--- 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
--- 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