mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/nix-compat): rename helper func

Browse source 
This only trims the output paths from a Derivation struct, not the
output hashes.

Change-Id: I9250fec4602ed05bb64540c4a89ddb6fb052be1f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8303
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: flokli <flokli@flokli.de>
This commit is contained in:
Florian Klink 2023-03-14 20:52:21 +01:00 committed by flokli
parent 84a8ed265c
commit a14880903c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tvix/nix-compat/src/derivation/tests/mod.rs
View file

@ -70,9 +70,9 @@ fn derivation_path(name: &str, expected_path: &str) {
); );
} }
/// This trims all outputs from a Derivation struct, /// This trims all output paths from a Derivation struct,
/// by setting outputs[$outputName].path and environment[$outputName] to the empty string. /// by setting outputs[$outputName].path and environment[$outputName] to the empty string.
fn derivation_with_trimmed_outputs(derivation: &Derivation) -> Derivation { fn derivation_with_trimmed_output_paths(derivation: &Derivation) -> Derivation {
let mut trimmed_env = derivation.environment.clone(); let mut trimmed_env = derivation.environment.clone();
let mut trimmed_outputs = derivation.outputs.clone(); let mut trimmed_outputs = derivation.outputs.clone();
@ -120,7 +120,7 @@ fn output_paths(name: &str, drv_path: &str) {
let data = read_file(&format!("{}/{}.json", RESOURCES_PATHS, drv_path)); let data = read_file(&format!("{}/{}.json", RESOURCES_PATHS, drv_path));
let expected_derivation: Derivation = serde_json::from_str(&data).expect("must deserialize"); let expected_derivation: Derivation = serde_json::from_str(&data).expect("must deserialize");
let mut derivation = derivation_with_trimmed_outputs(&expected_derivation); let mut derivation = derivation_with_trimmed_output_paths(&expected_derivation);
// calculate the derivation_or_fod_hash of derivation // calculate the derivation_or_fod_hash of derivation
// We don't expect the lookup function to be called for most derivations. // We don't expect the lookup function to be called for most derivations.