M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

conda: pull in openocd in artiq and artiq-dev

This commit is contained in:
Robert Jördens 2017-02-02 15:12:28 +01:00
parent aafefee7f5
commit edab068ac9
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conda/artiq-dev/meta.yaml
View File

@ -22,6 +22,7 @@ requirements:
- llvmlite-artiq 0.12.0.dev py35_30 - llvmlite-artiq 0.12.0.dev py35_30
- rust-core-or1k 1.16.0 11 - rust-core-or1k 1.16.0 11
- cargo - cargo
- openocd >=0.10
- lit - lit
- outputcheck - outputcheck
- coverage - coverage

1
conda/artiq/meta.yaml
View File

@ -19,6 +19,7 @@ requirements:
- llvmlite-artiq 0.12.0.dev py35_30 - llvmlite-artiq 0.12.0.dev py35_30
- binutils-or1k-linux - binutils-or1k-linux
- pythonparser 1.0 - pythonparser 1.0
- openocd >=0.10
- lit - lit
- outputcheck - outputcheck
- scipy - scipy