Merge branch 'updates' into 'next'

Update crane and rocskdb

See merge request famedly/conduit!640

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",

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",

flake.lock

@@ -51,17 +51,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1707685877,
+        "lastModified": 1713721181,
-        "narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=",
+        "narHash": "sha256-Vz1KRVTzU3ClBfyhOj8gOehZk21q58T1YsXC30V23PU=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e",
+        "rev": "55f4939ac59ff8f89c6a4029730a2d49ea09105f",
         "type": "github"
       },
       "original": {
         "owner": "ipetkov",
+        "ref": "master",
         "repo": "crane",
-        "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e",
         "type": "github"
       }
     },

flake.nix

@@ -13,12 +13,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     crane = {
-      # Pin latest crane that's not affected by the following bugs:
+      url = "github:ipetkov/crane?ref=master";
-      #
-      # * <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";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     attic.url = "github:zhaofengli/attic?ref=main";
@@ -60,7 +55,7 @@
 
       rocksdb' = pkgs:
       let
-        version = "8.11.3";
+        version = "9.1.0";
       in
       pkgs.rocksdb.overrideAttrs (old: {
         inherit version;
@@ -68,7 +63,7 @@
           owner = "facebook";
           repo = "rocksdb";
           rev = "v${version}";
-          hash = "sha256-OpEiMwGxZuxb9o3RQuSrwZMQGLhe9xLT1aa3HpI4KPs=";
+          hash = "sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8=";
         };
       });