about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-12-09T10·02+0200
committerclbot <clbot@tvl.fyi>2023-12-09T12·20+0000
commit5855959d879a6f57ff683f752fdc4d0c47427382 (patch)
treee86647ace8fb3d06b6494746b9b02e59777b50ea
parent5fd42a9e70cfbb3e9351d21e9e23df7b0d6feea6 (diff)
refactor(nix-compat/derivation): rename input derivation components r/7131
Match the naming in parse_input_derivations, call the keys
"input_derivation", and the values "output_names".

Change-Id: I7d1974819028f8ea543dc3ad78afb803ff9db865
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10224
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
-rw-r--r--tvix/nix-compat/src/derivation/write.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/tvix/nix-compat/src/derivation/write.rs b/tvix/nix-compat/src/derivation/write.rs
index 087227c99998..0981dfccae22 100644
--- a/tvix/nix-compat/src/derivation/write.rs
+++ b/tvix/nix-compat/src/derivation/write.rs
@@ -105,19 +105,19 @@ pub fn write_input_derivations(
 ) -> Result<(), io::Error> {
     write_char(writer, BRACKET_OPEN)?;
 
-    for (ii, (input_derivation_path, input_derivation)) in input_derivations.iter().enumerate() {
+    for (ii, (input_derivation, output_names)) in input_derivations.iter().enumerate() {
         if ii > 0 {
             write_char(writer, COMMA)?;
         }
 
         write_char(writer, PAREN_OPEN)?;
-        write_field(writer, input_derivation_path.as_str(), false)?;
+        write_field(writer, input_derivation.as_str(), false)?;
         write_char(writer, COMMA)?;
 
         write_char(writer, BRACKET_OPEN)?;
         write_array_elements(
             writer,
-            &input_derivation
+            &output_names
                 .iter()
                 .map(String::as_bytes)
                 .collect::<Vec<_>>(),