diff --git a/Cargo.lock b/Cargo.lock index be87d4ac6..920cdbdae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -63,9 +63,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -836,9 +836,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "f56b4c72906975ca04becb8a30e102dfecddd0c06181e3e95ddc444be28881f8" dependencies = [ "android-tzdata", "iana-time-zone", @@ -847,7 +847,7 @@ dependencies = [ "serde", "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -1417,6 +1417,7 @@ dependencies = [ "halo2_proofs", "lazy_static", "libc", + "libsqlite3-sys", "log", "pin-project-lite", "plotters", @@ -1793,9 +1794,9 @@ dependencies = [ [[package]] name = "dashmap" -version = "5.5.2" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b101bb8960ab42ada6ae98eb82afcea4452294294c45b681295af26610d6d28" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", "hashbrown 0.14.0", @@ -3252,6 +3253,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" dependencies = [ + "cc", "pkg-config", "vcpkg", ] @@ -3339,9 +3341,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76fc44e2588d5b436dbc3c6cf62aef290f90dab6235744a93dfe1cc18f451e2c" +checksum = "f478948fd84d9f8e86967bf432640e46adfb5a4bd4f14ef7e864ab38220534ae" [[package]] name = "memmap2" @@ -3495,22 +3497,17 @@ dependencies = [ [[package]] name = "num-modular" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f6ff034f5d857bc9a27fb0119" -dependencies = [ - "num-integer", - "num-traits", -] +checksum = "e48a714853526b1d300a61b36f2e8db08b0609670b3998892821f81ae88de00e" [[package]] name = "num-order" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e81e321057a0370997b13e6638bba6bd7f6f426e1f8e9a2562490a28eb23e1bc" +checksum = "6aa9b4c7c0bbb4106a611c992e642c5d840cd9b48b66f6e83ff9053e59683836" dependencies = [ "num-modular", - "num-traits", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 6b0b226ef..a1f7875de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -118,6 +118,10 @@ rusqlite = {version = "0.29.0", features = ["sqlcipher"], optional = true} sled = {version = "0.34.7", optional = true} sled-overlay = {version = "0.0.8", optional = true} +# When using musl-libc, some bug happens when linking the system lib, so we need this +[target.'cfg(target_env = "musl")'.dependencies] +libsqlite3-sys = {version = "*", features = ["bundled-sqlcipher"], optional = true} + [dev-dependencies] clap = {version = "4.4.1", features = ["derive"]} halo2_proofs = {version = "0.3.0", features = ["dev-graph", "sanity-checks"]} @@ -200,7 +204,7 @@ event-graph = [ p2p-unix = [] p2p-tcp = ["socket2"] -p2p-tor = ["arti-client", "tor-hscrypto"] +p2p-tor = ["arti-client", "tor-hscrypto", "libsqlite3-sys"] p2p-nym = [] net = [