From da3ce74f7345b4a723b04545d99120827d60e890 Mon Sep 17 00:00:00 2001 From: Peter Kolloch Date: Sat, 17 Feb 2024 11:08:43 +0700 Subject: docs(tvix/nix-compat): on store paths in fields Change-Id: Ie78b1c49d7386c70833a3b751799993ad9121aa6 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10933 Tested-by: BuildkiteCI Autosubmit: Peter Kolloch Reviewed-by: flokli --- tvix/nix-compat/src/derivation/mod.rs | 3 +++ tvix/nix-compat/src/derivation/output.rs | 2 ++ 2 files changed, 5 insertions(+) (limited to 'tvix') diff --git a/tvix/nix-compat/src/derivation/mod.rs b/tvix/nix-compat/src/derivation/mod.rs index 9b1db0f68e8b..5a59d640d65d 100644 --- a/tvix/nix-compat/src/derivation/mod.rs +++ b/tvix/nix-compat/src/derivation/mod.rs @@ -32,12 +32,15 @@ pub struct Derivation { #[serde(rename = "env")] pub environment: BTreeMap, + /// Map from drv path to output names used from this derivation. #[serde(rename = "inputDrvs")] pub input_derivations: BTreeMap>, + /// Plain store paths of additional inputs. #[serde(rename = "inputSrcs")] pub input_sources: BTreeSet, + /// Maps output names to Output. pub outputs: BTreeMap, pub system: String, diff --git a/tvix/nix-compat/src/derivation/output.rs b/tvix/nix-compat/src/derivation/output.rs index b7fa1ac379b0..521ea3dedc9c 100644 --- a/tvix/nix-compat/src/derivation/output.rs +++ b/tvix/nix-compat/src/derivation/output.rs @@ -4,8 +4,10 @@ use crate::store_path::StorePathRef; use serde::{Deserialize, Serialize}; use serde_json::Map; +/// References the derivation output. #[derive(Clone, Debug, Default, Eq, PartialEq, Serialize)] pub struct Output { + /// Store path of build result. pub path: String, #[serde(flatten)] -- cgit 1.4.1