From 2a987ca67a0858adf380ef7c8e7fb8b2a74aa1c6 Mon Sep 17 00:00:00 2001 From: strawberry Date: Thu, 18 Apr 2024 20:49:52 -0400 Subject: [PATCH] try using upstream rocksdb again Signed-off-by: strawberry --- Cargo.lock | 6 +++--- Cargo.toml | 4 ++-- flake.nix | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2726b06e..f33ae924 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2648,7 +2648,7 @@ dependencies = [ [[package]] name = "rust-librocksdb-sys" version = "0.20.0+9.1.0" -source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=7814116b2d7d0e218b2e349d2f41a276f22bea82#7814116b2d7d0e218b2e349d2f41a276f22bea82" +source = "git+https://github.com/zaidoon1/rust-rocksdb?branch=master#938c969c507c0baa35014c274148a077b953452d" dependencies = [ "bindgen", "bzip2-sys", @@ -2664,8 +2664,8 @@ dependencies = [ [[package]] name = "rust-rocksdb" -version = "0.23.2" -source = "git+https://github.com/zaidoon1/rust-rocksdb?rev=7814116b2d7d0e218b2e349d2f41a276f22bea82#7814116b2d7d0e218b2e349d2f41a276f22bea82" +version = "0.24.0" +source = "git+https://github.com/zaidoon1/rust-rocksdb?branch=master#938c969c507c0baa35014c274148a077b953452d" dependencies = [ "libc", "rust-librocksdb-sys", diff --git a/Cargo.toml b/Cargo.toml index ef81f4c6..bac268dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -277,8 +277,8 @@ rev = "76a4b84216fa4984eafd4c4ceb5f0892ae3edbbf" [dependencies.rust-rocksdb] git = "https://github.com/zaidoon1/rust-rocksdb" -#branch = "master" -rev = "7814116b2d7d0e218b2e349d2f41a276f22bea82" +branch = "master" +#rev = "7814116b2d7d0e218b2e349d2f41a276f22bea82" optional = true default-features = true features = ["multi-threaded-cf", "zstd"] diff --git a/flake.nix b/flake.nix index 191bb691..f7daff63 100644 --- a/flake.nix +++ b/flake.nix @@ -45,10 +45,10 @@ (pkgs.rocksdb.overrideAttrs (old: { inherit version; src = pkgs.fetchFromGitHub { - owner = "girlbossceo"; + owner = "facebook"; repo = "rocksdb"; - rev = "44f612d06c57ded8bcda2da87dfdd09546961b43"; - hash = "sha256-sw0F/EKbT20cYWaLBDPdmLaEDx/9Fhfjzp39U0JmBRE"; + rev = "bcf88d48ce8aa8b536aee4dd305533b3b83cf435"; + hash = "sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8"; }; }));