diff options
| author | Connor Brewster <cbrewster@hey.com> | 2023-09-16T15·20-0500 |
|---|---|---|
| committer | Connor Brewster <cbrewster@hey.com> | 2023-09-20T14·21+0000 |
| commit | 6b7c936bc50934b45df132f659292e2c45256dea (patch) | |
| tree | 74b369688e63ed4ff34c9270584ba30b91d7c979 /tvix/default.nix | |
| parent | 237c0eb415c632ec3480d890084c3d815298ac1f (diff) | |
refactor(tvix/store/fuse): Switch from fuser to fuse-backend-rs r/6621
This switches the FUSE implementation from fuser to fuse-backend-rs. fuse-backend-rs is designed to work with both FUSE and virtiofs. Virtiofs support will make it possible to plug the tvix-store into a microvm and have `/nix/store` access without having to setup FUSE inside the guest. Additionally fuse-backend-rs has nice support for running multiple FUSE threads and has some async support. The goal of this commit is to mechanically switch over to fuse-backend-rs with minimal changes. I did have to add some locks here and there because fuse-backend-rs uses `&self` on all methods whereas fuser uses `&mut self`. `&self` is required for concurrent access to the FUSE server, so this makes sense. We can consider switching to concurrent maps and use some other techniques to reduce lock contention and critical section size. Issue: https://b.tvl.fyi/issues/305 Change-Id: Icde5a58c6eef98f8984c1e04e980b756dfb76b47 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9341 Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/default.nix')
| -rw-r--r-- | tvix/default.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tvix/default.nix b/tvix/default.nix index f5f1ca47cbc9..e12ff9522f01 100644 --- a/tvix/default.nix +++ b/tvix/default.nix @@ -28,11 +28,6 @@ let nativeBuildInputs = prev.nativeBuildInputs or [ ] ++ iconvDarwinDep; }; - fuser = prev: { - buildInputs = prev.buildInputs or [ ] ++ [ pkgs.fuse ]; - nativeBuildInputs = prev.nativeBuildInputs or [ ] ++ [ pkgs.pkg-config ]; - }; - prost-build = prev: { nativeBuildInputs = protobufDep prev; }; @@ -59,6 +54,7 @@ let (crateName: (lib.nameValuePair "${crateName}-${crates.internal.crates.${crateName}.version}" crates.internal.crates.${crateName}.src.outputHash) ) [ + "fuse-backend-rs" "test-generator" "tonic-mock" "wu-manber" |