From 45cf7ae657086993cedaa7c72b813e319e805484 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 10 Apr 2024 16:33:02 +0300 Subject: refactor(tvix/nix-compat): move nar writer to tokio There's little reason to keep the nar writer using Async{Read,Write} traits from futures, while everything else async in tvix (and nix-compat) uses tokio. Change-Id: I8cd1efcd0dd5bb76471de997603c7b701a5095de Reviewed-on: https://cl.tvl.fyi/c/depot/+/11391 Tested-by: BuildkiteCI Reviewed-by: raitobezarius Reviewed-by: Brian Olsen --- tvix/Cargo.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'tvix/Cargo.nix') diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 216dd2c6e1fc..f4bc00bb3c43 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -6717,12 +6717,6 @@ rec { name = "enum-primitive-derive"; packageId = "enum-primitive-derive"; } - { - name = "futures-util"; - packageId = "futures-util"; - optional = true; - features = [ "io" ]; - } { name = "glob"; packageId = "glob"; @@ -6814,13 +6808,12 @@ rec { } ]; features = { - "async" = [ "futures-util" ]; - "futures-util" = [ "dep:futures-util" ]; + "async" = [ "tokio" ]; "pin-project-lite" = [ "dep:pin-project-lite" ]; "tokio" = [ "dep:tokio" ]; "wire" = [ "tokio" "pin-project-lite" ]; }; - resolvedDefaultFeatures = [ "async" "futures-util" "pin-project-lite" "tokio" "wire" ]; + resolvedDefaultFeatures = [ "async" "pin-project-lite" "tokio" "wire" ]; }; "nom" = rec { crateName = "nom"; -- cgit 1.4.1