mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(tvix/store): switch back to fuse-backend-rs upstream

Browse source 
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>
This commit is contained in:
Florian Klink 2023-12-16 23:26:23 +02:00 committed by clbot
parent 97dee277b0
commit 43ab1543e2
5 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tvix/Cargo.lock generated
View file

@ -848,8 +848,9 @@ dependencies = [
[[package]] [[package]]
name = "fuse-backend-rs" name = "fuse-backend-rs"
version = "0.10.5" version = "0.11.0"
source = "git+https://github.com/griff/fuse-backend-rs?branch=macfuse-fix#70b835cada7e1f18e5cbb13f6c4b698ba203c820" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e5a63a89f40ec26a0a1434e89de3f4ee939a920eae15d641053ee09ee6ed44b"
dependencies = [ dependencies = [
"arc-swap", "arc-swap",
"bitflags 1.3.2", "bitflags 1.3.2",

13
tvix/Cargo.nix
View file

@ -2460,14 +2460,9 @@ rec {
}; };
"fuse-backend-rs" = rec { "fuse-backend-rs" = rec {
crateName = "fuse-backend-rs"; crateName = "fuse-backend-rs";
version = "0.10.5"; version = "0.11.0";
edition = "2018"; edition = "2018";
workspace_member = null; sha256 = "0jyldvp0kvjk21j5vqga42lkksaf7zg8jkj3l6h2dv20kyl66nif";
src = pkgs.fetchgit {
url = "https://github.com/griff/fuse-backend-rs";
rev = "70b835cada7e1f18e5cbb13f6c4b698ba203c820";
sha256 = "107iaw8zqsz888xh9nkq3vvki1c1rqqqg0mncdplradhhn7wp3kp";
};
authors = [ authors = [
"Liu Bo <bo.liu@linux.alibaba.com>" "Liu Bo <bo.liu@linux.alibaba.com>"
"Liu Jiang <gerry@linux.alibaba.com>" "Liu Jiang <gerry@linux.alibaba.com>"
@ -2553,11 +2548,15 @@ rec {
"async-trait" = [ "dep:async-trait" ]; "async-trait" = [ "dep:async-trait" ];
"caps" = [ "dep:caps" ]; "caps" = [ "dep:caps" ];
"core-foundation-sys" = [ "dep:core-foundation-sys" ]; "core-foundation-sys" = [ "dep:core-foundation-sys" ];
"dbs-snapshot" = [ "dep:dbs-snapshot" ];
"default" = [ "fusedev" ]; "default" = [ "fusedev" ];
"fusedev" = [ "vmm-sys-util" "caps" "core-foundation-sys" ]; "fusedev" = [ "vmm-sys-util" "caps" "core-foundation-sys" ];
"io-uring" = [ "dep:io-uring" ]; "io-uring" = [ "dep:io-uring" ];
"persist" = [ "dbs-snapshot" "versionize" "versionize_derive" ];
"tokio" = [ "dep:tokio" ]; "tokio" = [ "dep:tokio" ];
"tokio-uring" = [ "dep:tokio-uring" ]; "tokio-uring" = [ "dep:tokio-uring" ];
"versionize" = [ "dep:versionize" ];
"versionize_derive" = [ "dep:versionize_derive" ];
"vhost" = [ "dep:vhost" ]; "vhost" = [ "dep:vhost" ];
"vhost-user-fs" = [ "virtiofs" "vhost" "caps" ]; "vhost-user-fs" = [ "virtiofs" "vhost" "caps" ];
"virtio-queue" = [ "dep:virtio-queue" ]; "virtio-queue" = [ "dep:virtio-queue" ];

1
tvix/crate-hashes.json
View file

@ -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-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-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", "futures-executor 0.3.29 (git+https://github.com/edef1c/futures-rs?rev=23e25061f2261794d6d611675a6372c96b70fa85#23e25061f2261794d6d611675a6372c96b70fa85)": "082d1f2201slvpl36v30lq8dchp5kh91yx64j9n9amf3bsdaf98r",

1
tvix/default.nix
View file

@ -76,7 +76,6 @@ let
(crateName: (crateName:
(lib.nameValuePair "${crateName}-${crates.internal.crates.${crateName}.version}" crates.internal.crates.${crateName}.src.outputHash) (lib.nameValuePair "${crateName}-${crates.internal.crates.${crateName}.version}" crates.internal.crates.${crateName}.src.outputHash)
) [ ) [
"fuse-backend-rs"
"test-generator" "test-generator"
"wu-manber" "wu-manber"

4
tvix/store/Cargo.toml
View file

@ -37,9 +37,7 @@ xz2 = "0.1.7"
[dependencies.fuse-backend-rs] [dependencies.fuse-backend-rs]
optional = true optional = true
# TODO: Switch back to upstream version once https://github.com/cloud-hypervisor/fuse-backend-rs/pull/157 lands. version = "0.11.0"
git = "https://github.com/griff/fuse-backend-rs"
branch = "macfuse-fix"
[dependencies.vhost] [dependencies.vhost]
optional = true optional = true