From a5fcfd80a16d985bcef7011ad94eab86cc0b4a72 Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Wed, 28 Aug 2024 15:45:50 +0200 Subject: fix(tvix/nix-compat-derive): Get rid of external feature flag The external feature flag was there because I couldn't find a way to refer to crate and nix-compat with the same name so that the generated code could be the same. In essence `use nix_compat::nix_daemon::de::NixDeserialize` is an error when used inside nix_compat crate. So my best fix was the external feature flag until I found the solution used here which also removes the flag completely. Change-Id: Ia3e89c6c350c3fb22ca87f974a39c21542aae152 Reviewed-on: https://cl.tvl.fyi/c/depot/+/12376 Tested-by: BuildkiteCI Reviewed-by: flokli Autosubmit: Brian Olsen --- tvix/Cargo.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'tvix/Cargo.nix') diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index c9fec85e2e37..be49a5c019b6 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -7419,7 +7419,6 @@ rec { name = "nix-compat-derive"; packageId = "nix-compat-derive"; optional = true; - usesDefaultFeatures = false; } { name = "nom"; @@ -7575,10 +7574,7 @@ rec { packageId = "tokio-test"; } ]; - features = { - "default" = [ "external" ]; - }; - resolvedDefaultFeatures = [ "default" "external" ]; + }; "nix-compat-derive-tests" = rec { crateName = "nix-compat-derive-tests"; -- cgit 1.4.1