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

2017-02-05 15:25:43 +00:00 · 2017-02-05 15:25:43 +00:00 · 52a046d0fd
commit 52a046d0fd
parent 3de19f6786
2 changed files with 2 additions and 1 deletions
--- a/artiq/firmware/runtime/Cargo.toml
+++ b/artiq/firmware/runtime/Cargo.toml
@ -24,6 +24,7 @@ byteorder = { version = "1.0", default-features = false }

 [dependencies.compiler_builtins]
 git = "https://github.com/rust-lang-nursery/compiler-builtins"
+rev = "631b568"
 features = ["mem"]

 [dependencies.smoltcp]
--- a/conda/artiq-dev/meta.yaml
+++ b/conda/artiq-dev/meta.yaml
@ -21,7 +21,7 @@ requirements:
    - llvm-or1k
    - llvmlite-artiq 0.12.0.dev py35_30
    - rust-core-or1k 1.17.0 12
-    - cargo >=0.16.0
+    - cargo =0.11.0
    - openocd >=0.10
    - lit
    - outputcheck