From 8c6ffb6bfc5a517c2531cfd83f9fba16cb5381fd Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Sun, 21 Apr 2024 12:31:49 -0700
Subject: [PATCH 1/2] unpin crane because the bug was fixed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'crane':
    'github:ipetkov/crane/2c653e4478476a52c6aa3ac0495e4dea7449ea0e?narHash=sha256-XoXRS%2B5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc%3D' (2024-02-11)
  → 'github:ipetkov/crane/55f4939ac59ff8f89c6a4029730a2d49ea09105f?narHash=sha256-Vz1KRVTzU3ClBfyhOj8gOehZk21q58T1YsXC30V23PU%3D' (2024-04-21)
---
 flake.lock | 8 ++++----
 flake.nix  | 7 +------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1c2142f2..1983d800 100644
--- a/flake.lock
+++ b/flake.lock
@@ -51,17 +51,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1707685877,
-        "narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=",
+        "lastModified": 1713721181,
+        "narHash": "sha256-Vz1KRVTzU3ClBfyhOj8gOehZk21q58T1YsXC30V23PU=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e",
+        "rev": "55f4939ac59ff8f89c6a4029730a2d49ea09105f",
         "type": "github"
       },
       "original": {
         "owner": "ipetkov",
+        "ref": "master",
         "repo": "crane",
-        "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 4536f172..69dd520c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,12 +13,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     crane = {
-      # Pin latest crane that's not affected by the following bugs:
-      #
-      # * <https://github.com/ipetkov/crane/issues/527#issuecomment-1978079140>
-      # * <https://github.com/toml-rs/toml/issues/691>
-      # * <https://github.com/toml-rs/toml/issues/267>
-      url = "github:ipetkov/crane?rev=2c653e4478476a52c6aa3ac0495e4dea7449ea0e";
+      url = "github:ipetkov/crane?ref=master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     attic.url = "github:zhaofengli/attic?ref=main";

From 61cb186b5b3e245f05928c54456489ca465c3437 Mon Sep 17 00:00:00 2001
From: Charles Hall <charles@computer.surgery>
Date: Sun, 21 Apr 2024 12:39:27 -0700
Subject: [PATCH 2/2] update rocksdb

---
 Cargo.lock | 8 ++++----
 Cargo.toml | 2 +-
 flake.nix  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cc614a77..6e870c06 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2204,9 +2204,9 @@ dependencies = [
 
 [[package]]
 name = "rust-librocksdb-sys"
-version = "0.18.1+8.11.3"
+version = "0.20.0+9.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef22f434855ceb8daf99073fcf909d957ad8705f5b530154e47978ae68e867c"
+checksum = "48b14f4848d8574c074bb26445b43e63735d802ef2fc5cc40c1b015134baee0c"
 dependencies = [
  "bindgen",
  "bzip2-sys",
@@ -2220,9 +2220,9 @@ dependencies = [
 
 [[package]]
 name = "rust-rocksdb"
-version = "0.22.7"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62223f035e676bb69da2ab9487e6f710da82be89473c658c51ed3b1a60c4b4a6"
+checksum = "d36eae38b1d3d0018e273191f791343bd3eb030d7da63aaa20350e41c0182881"
 dependencies = [
  "libc",
  "rust-librocksdb-sys",
diff --git a/Cargo.toml b/Cargo.toml
index b5be5055..cc5b37eb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -116,7 +116,7 @@ sd-notify = { version = "0.4.1", optional = true }
 
 [dependencies.rocksdb]
 package = "rust-rocksdb"
-version = "0.22.7"
+version = "0.24.0"
 optional = true
 features = [
     "multi-threaded-cf",
diff --git a/flake.nix b/flake.nix
index 69dd520c..114e221c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -55,7 +55,7 @@
 
       rocksdb' = pkgs:
       let
-        version = "8.11.3";
+        version = "9.1.0";
       in
       pkgs.rocksdb.overrideAttrs (old: {
         inherit version;
@@ -63,7 +63,7 @@
           owner = "facebook";
           repo = "rocksdb";
           rev = "v${version}";
-          hash = "sha256-OpEiMwGxZuxb9o3RQuSrwZMQGLhe9xLT1aa3HpI4KPs=";
+          hash = "sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8=";
         };
       });