conda: pull in openocd in artiq and artiq-dev

2017-02-02 15:12:28 +01:00 · 2017-02-02 15:12:28 +01:00 · edab068ac9
parent aafefee7f5
commit edab068ac9
2 changed files with 2 additions and 0 deletions
--- a/conda/artiq-dev/meta.yaml
+++ b/conda/artiq-dev/meta.yaml
@ -22,6 +22,7 @@ requirements:
    - llvmlite-artiq 0.12.0.dev py35_30
    - rust-core-or1k 1.16.0 11
    - cargo
+    - openocd >=0.10
    - lit
    - outputcheck
    - coverage
--- a/conda/artiq/meta.yaml
+++ b/conda/artiq/meta.yaml
@ -19,6 +19,7 @@ requirements:
    - llvmlite-artiq 0.12.0.dev py35_30
    - binutils-or1k-linux
    - pythonparser 1.0
+    - openocd >=0.10
    - lit
    - outputcheck
    - scipy