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

conda: roll cargo back to 0.11.0, then fix revision of compiler_builtins.

This commit is contained in:
whitequark 2017-02-05 15:25:43 +00:00
parent 3de19f6786
commit 52a046d0fd
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
artiq/firmware/runtime/Cargo.toml
View File

@ -24,6 +24,7 @@ byteorder = { version = "1.0", default-features = false }
[dependencies.compiler_builtins] [dependencies.compiler_builtins]
git = "https://github.com/rust-lang-nursery/compiler-builtins" git = "https://github.com/rust-lang-nursery/compiler-builtins"
rev = "631b568"
features = ["mem"] features = ["mem"]
[dependencies.smoltcp] [dependencies.smoltcp]

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

@ -21,7 +21,7 @@ requirements:
- llvm-or1k - llvm-or1k
- llvmlite-artiq 0.12.0.dev py35_30 - llvmlite-artiq 0.12.0.dev py35_30
- rust-core-or1k 1.17.0 12 - rust-core-or1k 1.17.0 12
- cargo >=0.16.0 - cargo =0.11.0
- openocd >=0.10 - openocd >=0.10
- lit - lit
- outputcheck - outputcheck