does this commit work???

Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-02-11 14:21:52 -05:00 committed by June
parent 0052d7b669
commit 4ef6c8a01a
2 changed files with 30 additions and 30 deletions

52
Cargo.lock generated
View file

@ -415,9 +415,9 @@ dependencies = [
"regex",
"reqwest",
"ring",
"rocksdb",
"ruma",
"rusqlite",
"rust-rocksdb",
"sd-notify",
"serde",
"serde_html_form",
@ -1280,6 +1280,22 @@ dependencies = [
"redox_syscall",
]
[[package]]
name = "librocksdb-sys"
version = "0.16.0+8.10.0"
source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8#8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8"
dependencies = [
"bindgen",
"bzip2-sys",
"cc",
"glob",
"libc",
"libz-sys",
"lz4-sys",
"pkg-config",
"zstd-sys",
]
[[package]]
name = "libsqlite3-sys"
version = "0.27.0"
@ -2086,6 +2102,15 @@ dependencies = [
"windows-sys 0.48.0",
]
[[package]]
name = "rocksdb"
version = "0.21.0"
source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8#8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8"
dependencies = [
"libc",
"librocksdb-sys",
]
[[package]]
name = "ruma"
version = "0.9.4"
@ -2288,31 +2313,6 @@ dependencies = [
"smallvec",
]
[[package]]
name = "rust-librocksdb-sys"
version = "0.16.0+8.10.0"
source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=8f65a73f0962edc4cc028f4012692043dc657a76#8f65a73f0962edc4cc028f4012692043dc657a76"
dependencies = [
"bindgen",
"bzip2-sys",
"cc",
"glob",
"libc",
"libz-sys",
"lz4-sys",
"pkg-config",
"zstd-sys",
]
[[package]]
name = "rust-rocksdb"
version = "0.22.1"
source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=8f65a73f0962edc4cc028f4012692043dc657a76#8f65a73f0962edc4cc028f4012692043dc657a76"
dependencies = [
"libc",
"rust-librocksdb-sys",
]
[[package]]
name = "rustc-demangle"
version = "0.1.23"

View file

@ -106,9 +106,9 @@ sd-notify = { version = "0.4.1", optional = true }
webpage = { version = "2.0", default-features = false }
[dependencies.rust-rocksdb]
[dependencies.rocksdb]
git = "https://github.com/zaidoon1/rust-rocksdb"
rev = "8f65a73f0962edc4cc028f4012692043dc657a76"
rev = "8526d0c8c4045fb68d5eb48c1db93f6adcfd1ff8"
default-features = false
features = ["multi-threaded-cf", "zstd", "snappy", "lz4"]
optional = true
@ -120,7 +120,7 @@ nix = { version = "0.27.1", features = ["resource"] }
[features]
default = ["conduit_bin", "backend_rocksdb", "systemd", "zstd_compression"]
backend_sqlite = ["sqlite"]
backend_rocksdb = ["rust-rocksdb"]
backend_rocksdb = ["rocksdb"]
jemalloc = ["tikv-jemalloc-ctl", "tikv-jemallocator"]
sqlite = ["rusqlite", "parking_lot", "tokio/signal"]
conduit_bin = ["axum"]
@ -130,7 +130,7 @@ zstd_compression = []
#brotli_compression = ["tower-http/compression-br"]
#compression = ["tower-http/compression-full"]
sha256_media = []
io_uring = ["rust-rocksdb/io-uring"]
io_uring = ["rocksdb/io-uring"]
[[bin]]
name = "conduit"