oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-10-10 19:32:05 +00:00
Code Wiki Activity

chore: bump rust-rocksdb to v0.43 to fix compilation failure

Browse source
This commit is contained in:
Simon Hammes 2025-10-05 15:17:50 +02:00 • committed by Matthias Ahouansou
parent 2f1f2bea29
commit 29aca17488
3 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Cargo.lock generated
View file

@ -137,7 +137,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61b1d86e7705efe1be1b569bab41d4fa1e14e220b60a160f78de2db687add079" checksum = "61b1d86e7705efe1be1b569bab41d4fa1e14e220b60a160f78de2db687add079"
dependencies = [ dependencies = [
"bindgen", "bindgen 0.69.5",
"cc", "cc",
"cmake", "cmake",
"dunce", "dunce",
@ -292,12 +292,30 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"regex", "regex",
"rustc-hash", "rustc-hash 1.1.0",
"shlex", "shlex",
"syn", "syn",
"which", "which",
] ]
[[package]]
name = "bindgen"
version = "0.72.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
dependencies = [
"bitflags 2.9.1",
"cexpr",
"clang-sys",
"itertools 0.12.1",
"proc-macro2",
"quote",
"regex",
"rustc-hash 2.1.1",
"shlex",
"syn",
]
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "1.3.2" version = "1.3.2"
@ -2798,11 +2816,11 @@ dependencies = [
[[package]] [[package]]
name = "rust-librocksdb-sys" name = "rust-librocksdb-sys"
version = "0.37.0+10.2.1" version = "0.39.0+10.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4951352c7a5abbf230a7563d6dae95ea2ea834b70f06de90b8f083debc977f8f" checksum = "29bd25c12159c153158008a67cb95a879b09e317c7be19362c7c1a833611844c"
dependencies = [ dependencies = [
"bindgen", "bindgen 0.72.1",
"bzip2-sys", "bzip2-sys",
"cc", "cc",
"glob", "glob",
@ -2814,11 +2832,12 @@ dependencies = [
[[package]] [[package]]
name = "rust-rocksdb" name = "rust-rocksdb"
version = "0.41.0" version = "0.43.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e04453858c1d03683f6e142026dbf30c387f71c7bb0f017b408d96364c0acdbd" checksum = "32acf115610698835348708c8e0fd18d44ea6bb597bfd92eb1736d6cb8e691c8"
dependencies = [ dependencies = [
"libc", "libc",
"parking_lot",
"rust-librocksdb-sys", "rust-librocksdb-sys",
] ]
@ -2834,6 +2853,12 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
[[package]]
name = "rustc-hash"
version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
[[package]] [[package]]
name = "rustc_version" name = "rustc_version"
version = "0.4.0" version = "0.4.0"

2
Cargo.toml
View file

@ -186,7 +186,7 @@ git = "https://github.com/ruma/ruma.git"
features = ["lz4", "multi-threaded-cf", "zstd"] features = ["lz4", "multi-threaded-cf", "zstd"]
optional = true optional = true
package = "rust-rocksdb" package = "rust-rocksdb"
version = "0.41" version = "0.43"
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
nix = { version = "0.30", features = ["resource"] } nix = { version = "0.30", features = ["resource"] }

4
flake.nix
View file

@ -36,7 +36,7 @@
rocksdb = rocksdb =
let let
version = "10.2.1"; version = "10.5.1";
in in
pkgs.rocksdb.overrideAttrs (old: { pkgs.rocksdb.overrideAttrs (old: {
inherit version; inherit version;
@ -44,7 +44,7 @@
owner = "facebook"; owner = "facebook";
repo = "rocksdb"; repo = "rocksdb";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-v8kZShgz0O3nHZwWjTvhcM56qAs/le1XgMVYyvVd4tg="; hash = "sha256-TDYXzYbOLhcIRi+qi0FW1OLVtfKOF+gUbj62Tgpp3/E=";
}; };
}); });