Skip to content

Commit c33c1df

Browse files
Spaqinsbourdeauducq
authored andcommitted
remove cargo-xbuild, fix nix build
1 parent 6d0821e commit c33c1df

File tree

10 files changed

+232
-35
lines changed

10 files changed

+232
-35
lines changed

artiq/firmware/Cargo.lock

+211-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

artiq/firmware/bootloader/Cargo.toml

+18-1
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,25 @@ path = "main.rs"
1313
build_misoc = { path = "../libbuild_misoc" }
1414

1515
[dependencies]
16-
byteorder = { version = "1.0", default-features = false }
16+
byteorder = { version = "=1.4.3", default-features = false }
1717
crc = { version = "1.7", default-features = false }
1818
board_misoc = { path = "../libboard_misoc", features = ["uart_console", "smoltcp"] }
1919
smoltcp = { version = "0.8.2", default-features = false, features = ["medium-ethernet", "proto-ipv4", "proto-ipv6", "socket-tcp"] }
2020
riscv = { version = "0.6.0", features = ["inline-asm"] }
21+
22+
# insanity required by using cargo build-std over xbuild with nix
23+
[dev-dependencies]
24+
getopts = "=0.2.21"
25+
libc = "=0.2.79"
26+
unicode-width = "=0.1.8"
27+
addr2line = "=0.14.0"
28+
memchr = "=2.3.4"
29+
hashbrown = "=0.9.0"
30+
miniz_oxide = "=0.4.0"
31+
rustc-demangle = "=0.1.18"
32+
hermit-abi = "=0.1.17"
33+
dlmalloc = "=0.2.1"
34+
wasi = "=0.9.0"
35+
fortanix-sgx-abi = "=0.3.3"
36+
cc = "=1.0.60"
37+
compiler_builtins = "=0.1.39"

0 commit comments

Comments
 (0)