From 43ab1543e22f12eb6cf3b290f8ec2c04818041e4 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 16 Dec 2023 23:26:23 +0200
Subject: [PATCH] chore(tvix/store): switch back to fuse-backend-rs upstream

The fix mentioned in Cargo.toml did land in
https://github.com/cloud-hypervisor/fuse-backend-rs/pull/162.

Change-Id: I4451f910806f05400f7e0f83581ae786f170b9e2
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10375
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
---
 tvix/Cargo.lock        |  5 +++--
 tvix/Cargo.nix         | 13 ++++++-------
 tvix/crate-hashes.json |  1 -
 tvix/default.nix       |  1 -
 tvix/store/Cargo.toml  |  4 +---
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock
index 9a0f05193..b1e6c7d70 100644
--- a/tvix/Cargo.lock
+++ b/tvix/Cargo.lock
@@ -848,8 +848,9 @@ dependencies = [
 
 [[package]]
 name = "fuse-backend-rs"
-version = "0.10.5"
-source = "git+https://github.com/griff/fuse-backend-rs?branch=macfuse-fix#70b835cada7e1f18e5cbb13f6c4b698ba203c820"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e5a63a89f40ec26a0a1434e89de3f4ee939a920eae15d641053ee09ee6ed44b"
 dependencies = [
  "arc-swap",
  "bitflags 1.3.2",
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index c7957403e..bf280efa3 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -2460,14 +2460,9 @@ rec {
       };
       "fuse-backend-rs" = rec {
         crateName = "fuse-backend-rs";
-        version = "0.10.5";
+        version = "0.11.0";
         edition = "2018";
-        workspace_member = null;
-        src = pkgs.fetchgit {
-          url = "https://github.com/griff/fuse-backend-rs";
-          rev = "70b835cada7e1f18e5cbb13f6c4b698ba203c820";
-          sha256 = "107iaw8zqsz888xh9nkq3vvki1c1rqqqg0mncdplradhhn7wp3kp";
-        };
+        sha256 = "0jyldvp0kvjk21j5vqga42lkksaf7zg8jkj3l6h2dv20kyl66nif";
         authors = [
           "Liu Bo <bo.liu@linux.alibaba.com>"
           "Liu Jiang <gerry@linux.alibaba.com>"
@@ -2553,11 +2548,15 @@ rec {
           "async-trait" = [ "dep:async-trait" ];
           "caps" = [ "dep:caps" ];
           "core-foundation-sys" = [ "dep:core-foundation-sys" ];
+          "dbs-snapshot" = [ "dep:dbs-snapshot" ];
           "default" = [ "fusedev" ];
           "fusedev" = [ "vmm-sys-util" "caps" "core-foundation-sys" ];
           "io-uring" = [ "dep:io-uring" ];
+          "persist" = [ "dbs-snapshot" "versionize" "versionize_derive" ];
           "tokio" = [ "dep:tokio" ];
           "tokio-uring" = [ "dep:tokio-uring" ];
+          "versionize" = [ "dep:versionize" ];
+          "versionize_derive" = [ "dep:versionize_derive" ];
           "vhost" = [ "dep:vhost" ];
           "vhost-user-fs" = [ "virtiofs" "vhost" "caps" ];
           "virtio-queue" = [ "dep:virtio-queue" ];
diff --git a/tvix/crate-hashes.json b/tvix/crate-hashes.json
index 02203fac7..e2a8bfb76 100644
--- a/tvix/crate-hashes.json
+++ b/tvix/crate-hashes.json
@@ -1,5 +1,4 @@
 {
-  "fuse-backend-rs 0.10.5 (git+https://github.com/griff/fuse-backend-rs?branch=macfuse-fix#70b835cada7e1f18e5cbb13f6c4b698ba203c820)": "107iaw8zqsz888xh9nkq3vvki1c1rqqqg0mncdplradhhn7wp3kp",
   "futures-channel 0.3.29 (git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85)": "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r",
   "futures-core 0.3.29 (git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85)": "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r",
   "futures-executor 0.3.29 (git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85)": "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r",
diff --git a/tvix/default.nix b/tvix/default.nix
index 342508c37..ef6aff3bc 100644
--- a/tvix/default.nix
+++ b/tvix/default.nix
@@ -76,7 +76,6 @@ let
         (crateName:
           (lib.nameValuePair "${crateName}-${crates.internal.crates.${crateName}.version}" crates.internal.crates.${crateName}.src.outputHash)
         ) [
-        "fuse-backend-rs"
         "test-generator"
         "wu-manber"
 
diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml
index 86d40d72b..044b305b9 100644
--- a/tvix/store/Cargo.toml
+++ b/tvix/store/Cargo.toml
@@ -37,9 +37,7 @@ xz2 = "0.1.7"
 
 [dependencies.fuse-backend-rs]
 optional = true
-# TODO: Switch back to upstream version once https://github.com/cloud-hypervisor/fuse-backend-rs/pull/157 lands.
-git = "https://github.com/griff/fuse-backend-rs"
-branch = "macfuse-fix"
+version = "0.11.0"
 
 [dependencies.vhost]
 optional = true