git.delta.rocks / jrsonnet / refs/commits / d602c0676eb0

--- a/crates/fleet-base/src/host.rs
+++ b/crates/fleet-base/src/host.rs
@@ -520,7 +520,7 @@
 		let secrets = nix_go!(nixos.secrets);
 		let mut out = Vec::new();
 		for name in secrets.list_fields()? {
-			let secret = secrets.get_field(&name)?;
+			let secret = secrets.get_field(&name).context("getting secret")?;
 			let is_shared: bool = nix_go_json!(secret.shared);
 			if is_shared {
 				continue;

--- a/crates/nix-eval/src/lib.rs
+++ b/crates/nix-eval/src/lib.rs
@@ -727,7 +727,9 @@
 		let function = match kind {
 			FunctorKind::Function => self.clone(),
 			FunctorKind::Functor => {
-				let f = self.get_field("__functor")?;
+				let f = self
+					.get_field("__functor")
+					.context("getting functor value")?;
 				assert_eq!(
 					f.type_of(),
 					NixType::Function,
@@ -754,9 +756,12 @@
 		if !self.is_derivation() {
 			bail!("expected derivation to build")
 		}
-		let output_name = self.get_field("outputName")?.to_string()?;
+		let output_name = self
+			.get_field("outputName")
+			.context("getting output name field")?
+			.to_string()?;
 		let v = if output_name != output {
-			let out = self.get_field(output)?;
+			let out = self.get_field(output).context("getting target output")?;
 			if !out.is_derivation() {
 				bail!("unknown output: {output}");
 			}

6666
67#[macro_export]67#[macro_export]
68macro_rules! nix_go {68macro_rules! nix_go {
69	(@o($o:expr) . $var:ident $($tt:tt)*) => {{69	(@o($o:expr, $path:expr) . $var:ident $($tt:tt)*) => {{
70		nix_go!(@o($o.get_field(stringify!($var))?) $($tt)*)70		nix_go!(@o($o.get_field(stringify!($var)).context(concat!("getting nested ", $path))?, $path) $($tt)*)
71	}};71	}};
72	(@o($o:expr) [ $v:expr ] $($tt:tt)*) => {{72	(@o($o:expr, $path:expr) [ $v:expr ] $($tt:tt)*) => {{
73		nix_go!(@o($o.get_field($v)?) $($tt)*)73		nix_go!(@o($o.get_field($v).context(concat!("getting nested ", $path))?, $path) $($tt)*)
74	}};74	}};
75	(@o($o:expr) ($($var:tt)*) $($tt:tt)*) => {75	(@o($o:expr, $path:expr) ($($var:tt)*) $($tt:tt)*) => {
76		nix_go!(@o($o.call($crate::nix_expr_inner!($($var)+))?) $($tt)*)76		nix_go!(@o($o.call($crate::nix_expr_inner!($($var)+)).context(concat!("getting nested ", $path))?, $path) $($tt)*)
77	};77	};
78	(@o($o:expr)) => {$o};78	(@o($o:expr, $path:expr)) => {$o};
79	($field:ident $($tt:tt)+) => {{79	($field:ident $($tt:tt)+) => {{
80		use $crate::nix_go;80		use $crate::nix_go;
81		use ::anyhow::Context;
81		let out = $field.clone();82		let out = $field.clone();
82		nix_go!(@o(out) $($tt)*)83		nix_go!(@o(out, ::std::stringify!($($tt)*)) $($tt)*)
83	}}84	}}
84}85}
85#[macro_export]86#[macro_export]