From 79531c3dab1c24ff3171c0aa067004c8e6c92e3f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 29 Jul 2023 21:14:44 +0200 Subject: refactor(tvix/nix-compat): support non-unicode Derivations Derivations can have non-unicode strings in their env values, so the ATerm representations are not necessarily String anymore, but Vec. Change-Id: Ic23839471eb7f68d9c3c30667c878830946b6607 Reviewed-on: https://cl.tvl.fyi/c/depot/+/8990 Tested-by: BuildkiteCI Reviewed-by: raitobezarius Autosubmit: flokli --- tvix/cli/src/derivation.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tvix/cli/src/derivation.rs') diff --git a/tvix/cli/src/derivation.rs b/tvix/cli/src/derivation.rs index fa246cc74f..f8afe19461 100644 --- a/tvix/cli/src/derivation.rs +++ b/tvix/cli/src/derivation.rs @@ -283,7 +283,7 @@ mod derivation_builtins { // Most of these are also added to the builder's environment in "raw" form. if drv .environment - .insert(name.as_str().to_string(), val_str) + .insert(name.as_str().to_string(), val_str.into()) .is_some() { return Err(Error::DuplicateEnvVar(name.as_str().to_string()).into()); @@ -312,7 +312,7 @@ mod derivation_builtins { } else { let mut refscan = state.reference_scanner(); drv.arguments.iter().for_each(|s| refscan.scan_str(s)); - drv.environment.values().for_each(|s| refscan.scan_str(s)); + drv.environment.values().for_each(|s| refscan.scan_bytes(s)); refscan.scan_str(&drv.builder); refscan.finalise() } @@ -324,7 +324,7 @@ mod derivation_builtins { for output in drv.outputs.keys() { if drv .environment - .insert(output.to_string(), String::new()) + .insert(output.to_string(), String::new().into()) .is_some() { emit_warning_kind(&co, WarningKind::ShadowedOutput(output.to_string())).await; -- cgit 1.4.1