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

conda: bump openocd to simplify pinning

This commit is contained in:
Robert Jördens 2017-10-23 17:26:41 +02:00
parent 7edff48b6d
commit 70e6f77d4d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,7 @@ requirements:
- llvmlite-artiq 0.12.0
- rust-core-or1k 1.20.0 16
- cargo 0.11.0
- openocd 0.10.0+git 2
- openocd 0.10.0+git1
- lit
- outputcheck
- coverage

2
conda/artiq/meta.yaml
View File

@ -29,7 +29,7 @@ requirements:
- llvmlite-artiq 0.12.0
- binutils-or1k-linux
- pythonparser >=1.1
- openocd 0.10.0+git 2
- openocd 0.10.0+git1
- lit
- outputcheck
- scipy