From 24c408f4c6b780399f47632f0bfa99739d9515a6 Mon Sep 17 00:00:00 2001
From: morguldir <morguldir@protonmail.com>
Date: Sun, 8 Sep 2024 19:21:23 +0200
Subject: [PATCH] bump rocksdb to 9.6.1, add binutils to devshell

---
 Cargo.lock                   | 8 ++++----
 deps/rust-rocksdb/Cargo.toml | 2 +-
 flake.lock                   | 8 ++++----
 flake.nix                    | 5 ++++-
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ce5ba829..e95de4b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3194,8 +3194,8 @@ dependencies = [
 
 [[package]]
 name = "rust-librocksdb-sys"
-version = "0.25.0+9.5.2"
-source = "git+https://github.com/girlbossceo/rust-rocksdb-zaidoon1?rev=5383ca8173299066b516406e3a2cf945ead891cb#5383ca8173299066b516406e3a2cf945ead891cb"
+version = "0.26.0+9.6.1"
+source = "git+https://github.com/girlbossceo/rust-rocksdb-zaidoon1?rev=22f942609921ecf837399e1c2fe6fcb8dbb1095e#22f942609921ecf837399e1c2fe6fcb8dbb1095e"
 dependencies = [
  "bindgen",
  "bzip2-sys",
@@ -3211,8 +3211,8 @@ dependencies = [
 
 [[package]]
 name = "rust-rocksdb"
-version = "0.29.0"
-source = "git+https://github.com/girlbossceo/rust-rocksdb-zaidoon1?rev=5383ca8173299066b516406e3a2cf945ead891cb#5383ca8173299066b516406e3a2cf945ead891cb"
+version = "0.30.0"
+source = "git+https://github.com/girlbossceo/rust-rocksdb-zaidoon1?rev=22f942609921ecf837399e1c2fe6fcb8dbb1095e#22f942609921ecf837399e1c2fe6fcb8dbb1095e"
 dependencies = [
  "libc",
  "rust-librocksdb-sys",
diff --git a/deps/rust-rocksdb/Cargo.toml b/deps/rust-rocksdb/Cargo.toml
index cc87e99d..e86f6e77 100644
--- a/deps/rust-rocksdb/Cargo.toml
+++ b/deps/rust-rocksdb/Cargo.toml
@@ -27,7 +27,7 @@ malloc-usable-size = ["rust-rocksdb/malloc-usable-size"]
 
 [dependencies.rust-rocksdb]
 git = "https://github.com/girlbossceo/rust-rocksdb-zaidoon1"
-rev = "5383ca8173299066b516406e3a2cf945ead891cb"
+rev = "22f942609921ecf837399e1c2fe6fcb8dbb1095e"
 #branch = "master"
 default-features = false
 
diff --git a/flake.lock b/flake.lock
index 15ce8e43..bd82f81f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -680,16 +680,16 @@
     "rocksdb": {
       "flake": false,
       "locked": {
-        "lastModified": 1724285323,
-        "narHash": "sha256-k60kreKQ0v+bQ16yBd2SfLYpuNjMw2qoRmZL/S3k6CU=",
+        "lastModified": 1725811807,
+        "narHash": "sha256-k6aubvLSJwW7CtIxBRSlM6Z8UiJDCdFUgDWPYLV47Qk=",
         "owner": "girlbossceo",
         "repo": "rocksdb",
-        "rev": "5a67ad7ce46328578ee5587fb0c23faa03d14e67",
+        "rev": "347d50e212b24d98b5ad9841404ff80c1bb873f0",
         "type": "github"
       },
       "original": {
         "owner": "girlbossceo",
-        "ref": "v9.5.2",
+        "ref": "v9.6.1",
         "repo": "rocksdb",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 7f2bfeb9..74d15408 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,7 +9,7 @@
     flake-utils.url = "github:numtide/flake-utils?ref=main";
     nix-filter.url = "github:numtide/nix-filter?ref=main";
     nixpkgs.url = "github:NixOS/nixpkgs?ref=nixpkgs-unstable";
-    rocksdb = { url = "github:girlbossceo/rocksdb?ref=v9.5.2"; flake = false; };
+    rocksdb = { url = "github:girlbossceo/rocksdb?ref=v9.6.1"; flake = false; };
     liburing = { url = "github:axboe/liburing?ref=master"; flake = false; };
   };
 
@@ -120,6 +120,9 @@
           cargo-audit
           liburing
 
+          # Required by hardened-malloc.rs dep
+          binutils
+
           # Needed for producing Debian packages
           cargo-deb