diff options
| author | Florian Klink <flokli@flokli.de> | 2023-09-25T19·18+0300 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2023-09-26T09·51+0000 |
| commit | 124c1c06dec432501a236bc8a04f362dd94a7af7 (patch) | |
| tree | dd2e8da2db7ee25fc1a039fc158bf2facd00ed00 | |
| parent | f8746fcab0d6cbd6d9e7a49ce2217f858151a476 (diff) | |
chore(tvix/store): move fuse-backend-rs back to upstream r/6654
It's in no release yet, but this is the current rev in master. Change-Id: I9e4bc2fde26e85c4182bd66b3e566c2d957072ed Reviewed-on: https://cl.tvl.fyi/c/depot/+/9469 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: raitobezarius <tvl@lahfa.xyz> Tested-by: BuildkiteCI
| -rw-r--r-- | tvix/Cargo.lock | 2 | ||||
| -rw-r--r-- | tvix/Cargo.nix | 6 | ||||
| -rw-r--r-- | tvix/crate-hashes.json | 2 | ||||
| -rw-r--r-- | tvix/store/Cargo.toml | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index d4a8fec84aeb..5129a2ba33bc 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -773,7 +773,7 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] name = "fuse-backend-rs" version = "0.10.5" -source = "git+https://github.com/cbrewster/fuse-backend-rs.git?branch=optional-allow_other#b553ce526a7267578ae5af4f4cbba717932518ac" +source = "git+https://github.com/cloud-hypervisor/fuse-backend-rs?rev=402e7c531bc75bc44ac366dc59477de8b5d4ca08#402e7c531bc75bc44ac366dc59477de8b5d4ca08" dependencies = [ "arc-swap", "bitflags", diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 8f7686ce5cfc..297825787ae1 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -2190,9 +2190,9 @@ rec { edition = "2018"; workspace_member = null; src = pkgs.fetchgit { - url = "https://github.com/cbrewster/fuse-backend-rs.git"; - rev = "b553ce526a7267578ae5af4f4cbba717932518ac"; - sha256 = "0165g94bcwyg03yi4kbr6yw75p42kiz2vd1d7s8f3fj4injy49vx"; + url = "https://github.com/cloud-hypervisor/fuse-backend-rs"; + rev = "402e7c531bc75bc44ac366dc59477de8b5d4ca08"; + sha256 = "0f70f0wxkx4h18wvkpnnpxhyzvg6f9z1063334w1nlfg0n15wb9y"; }; authors = [ "Liu Bo <bo.liu@linux.alibaba.com>" diff --git a/tvix/crate-hashes.json b/tvix/crate-hashes.json index 360ab6937fef..6c7f1e04ce5d 100644 --- a/tvix/crate-hashes.json +++ b/tvix/crate-hashes.json @@ -1,5 +1,5 @@ { - "fuse-backend-rs 0.10.5 (git+https://github.com/cbrewster/fuse-backend-rs.git?branch=optional-allow_other#b553ce526a7267578ae5af4f4cbba717932518ac)": "0165g94bcwyg03yi4kbr6yw75p42kiz2vd1d7s8f3fj4injy49vx", + "fuse-backend-rs 0.10.5 (git+https://github.com/cloud-hypervisor/fuse-backend-rs?rev=402e7c531bc75bc44ac366dc59477de8b5d4ca08#402e7c531bc75bc44ac366dc59477de8b5d4ca08)": "0f70f0wxkx4h18wvkpnnpxhyzvg6f9z1063334w1nlfg0n15wb9y", "test-generator 0.3.0 (git+https://github.com/JamesGuthrie/test-generator.git?rev=82e799979980962aec1aa324ec6e0e4cad781f41#82e799979980962aec1aa324ec6e0e4cad781f41)": "08brp3qqa55hijc7xby3lam2cc84hvx1zzfqv6lj7smlczh8k32y", "tonic-mock 0.1.0 (git+https://github.com/brainrake/tonic-mock?branch=bump-dependencies#ec1a15510875de99d709d684190db5d9beab175e)": "0lwa03hpp0mxa6aa1zv5w68k61y4hccfm0q2ykyq392fwal8vb50", "wu-manber 0.1.0 (git+https://github.com/tvlfyi/wu-manber.git#0d5b22bea136659f7de60b102a7030e0daaa503d)": "1zhk83lbq99xzyjwphv2qrb8f8qgfqwa5bbbvyzm0z0bljsjv0pd" diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml index 05b3f4c863f1..94be3e28638b 100644 --- a/tvix/store/Cargo.toml +++ b/tvix/store/Cargo.toml @@ -35,8 +35,8 @@ tokio-listener = { version = "0.2.1" } [dependencies.fuse-backend-rs] optional = true # TODO: Switch back to upstream version once https://github.com/cloud-hypervisor/fuse-backend-rs/pull/153 lands. -git = "https://github.com/cbrewster/fuse-backend-rs.git" -branch = "optional-allow_other" +git = "https://github.com/cloud-hypervisor/fuse-backend-rs" +rev = "402e7c531bc75bc44ac366dc59477de8b5d4ca08" # Ideally this would only be enabled if virtiofs is enabled # Ex: virtiofs = [..., "fuse-backend-rs/?vhost-user-fs", ...] # However, crate2nix doesn't properly understand this syntax and doesn't |