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

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -738,6 +738,12 @@
 ]
 
 [[package]]
+name = "cursor-icon"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991"
+
+[[package]]
 name = "curve25519-dalek"
 version = "4.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1956,6 +1962,7 @@
  "tokio-util",
  "tracing",
  "tracing-indicatif",
+ "vte 0.15.0",
 ]
 
 [[package]]
@@ -3666,7 +3673,7 @@
  "itoa",
  "log",
  "unicode-width 0.1.14",
- "vte",
+ "vte 0.11.1",
 ]
 
 [[package]]
@@ -3681,6 +3688,19 @@
 ]
 
 [[package]]
+name = "vte"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5924018406ce0063cd67f8e008104968b74b563ee1b85dde3ed1f7cb87d3dbd"
+dependencies = [
+ "arrayvec",
+ "bitflags",
+ "cursor-icon",
+ "log",
+ "memchr",
+]
+
+[[package]]
 name = "vte_generate_state_changes"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"

--- a/crates/fleet-base/src/opts.rs
+++ b/crates/fleet-base/src/opts.rs
@@ -8,8 +8,8 @@
 
 use anyhow::{Context, Result, bail};
 use nix_eval::{
-	FetchSettings, FlakeReference, FlakeReferenceParseFlags, FlakeSettings, Value, nix_go,
-	util::assert_warn,
+	FetchSettings, FlakeLockFlags, FlakeReference, FlakeReferenceParseFlags, FlakeSettings, Value,
+	nix_go, util::assert_warn,
 };
 use nom::{
 	Parser,
@@ -229,8 +229,11 @@
 			&parse,
 			&fetch_settings,
 		)?;
-		let flake = flake.lock(&fetch_settings)?;
 
+		let lock = FlakeLockFlags::new(&flake_settings)?;
+
+		let flake = flake.lock(&fetch_settings, &flake_settings, &lock)?;
+
 		let flake = flake.get_attrs(&mut flake_settings)?;
 
 		let builtins_field = Value::eval("builtins")?;

--- a/crates/nix-eval/Cargo.toml
+++ b/crates/nix-eval/Cargo.toml
@@ -19,6 +19,7 @@
 itertools = "0.14.0"
 test-log = { version = "0.2.18", features = ["trace"] }
 tracing-indicatif = { version = "0.3.13", optional = true }
+vte = { version = "0.15.0", features = ["ansi"] }
 
 [build-dependencies]
 bindgen = "0.72.0"

19	alloc_value, c_context, c_context_create, err_code, err_info_msg, eval_state_build,19	alloc_value, c_context, c_context_create, err_code, err_info_msg, eval_state_build,
20	eval_state_builder_new, expr_eval_from_string, fetchers_settings, fetchers_settings_free,20	eval_state_builder_new, expr_eval_from_string, fetchers_settings, fetchers_settings_free,
21	fetchers_settings_new, flake_lock, flake_lock_flags, flake_lock_flags_free,21	fetchers_settings_new, flake_lock, flake_lock_flags, flake_lock_flags_free,
22	flake_lock_flags_new, flake_lock_flags_set_mode_virtual, flake_reference_parse_flags,22	flake_lock_flags_new, flake_reference_parse_flags, flake_reference_parse_flags_free,
23	flake_reference_parse_flags_free, flake_reference_parse_flags_new,23	flake_reference_parse_flags_new, flake_reference_parse_flags_set_base_directory,
24	flake_reference_parse_flags_set_base_directory, flake_settings, flake_settings_free,24	flake_settings, flake_settings_free, flake_settings_new, get_string, init_bool, init_int,
25	flake_settings_new, init_bool, init_int, init_string, locked_flake_free,25	init_string, locked_flake_free, locked_flake_get_output_attrs, set_err_msg, setting_set,
26	locked_flake_get_output_attrs, set_err_msg, setting_set, state_free, value_decref,26	state_free, value_decref, value_incref,
27	value_incref,
226	fn new() -> Result<Self> {225	fn new() -> Result<Self> {
227		let mut ctx = NixContext::new();226		let mut ctx = NixContext::new();
228		let store = ctx227		let store = ctx
229			.run_in_context(|c| unsafe { nix_raw::store_open(c, c"daemon".as_ptr(), null_mut()) })228			.run_in_context(|c| unsafe { nix_raw::store_open(c, c"auto".as_ptr(), null_mut()) })
230			.map(Store)?;229			.map(Store)?;
231230
232		let builder = ctx.run_in_context(|c| unsafe { eval_state_builder_new(c, store.0) })?;231		let builder = ctx.run_in_context(|c| unsafe { eval_state_builder_new(c, store.0) })?;
232		ctx.run_in_context(|c| {
233			unsafe { nix_raw::eval_state_builder_load(c, builder) }
234			// eval_s
235		})?;
233		ctx.run_in_context(|c| {236		ctx.run_in_context(|c| {
234			unsafe {237			unsafe {
235				nix_raw::eval_state_builder_set_eval_setting(238				nix_raw::eval_state_builder_set_eval_setting(
363		}366		}
364	}367	}
365}368}
366struct FlakeLockFlags(*mut flake_lock_flags);369pub struct FlakeLockFlags(*mut flake_lock_flags);
367impl FlakeLockFlags {370impl FlakeLockFlags {
368	fn new(settings: &mut FlakeSettings) -> Result<Self> {371	pub fn new(settings: &FlakeSettings) -> Result<Self> {
369		let o = with_default_context(|c, _| unsafe { flake_lock_flags_new(c, settings.0) })372		let o = with_default_context(|c, _| unsafe { flake_lock_flags_new(c, settings.0) })
370			.map(Self)?;373			.map(Self)?;
371		with_default_context(|c, _| unsafe { flake_lock_flags_set_mode_virtual(c, o.0) })?;374		// with_default_context(|c, _| unsafe { flake_lock_flags_set_mode_virtual(c, o.0) })?;
372375
373		Ok(o)376		Ok(o)
374	}377	}
432435
433		Ok((Self(out), fragment))436		Ok((Self(out), fragment))
434	}437	}
435	#[instrument(name = "lock-flake", skip(self, fetch))]438	#[instrument(name = "lock-flake", skip(self, fetch, flake, lock))]
436	pub fn lock(&mut self, fetch: &FetchSettings) -> Result<LockedFlake> {439	pub fn lock(
437		let mut settings = FlakeSettings::new()?;440		&mut self,
438		let lock_flags = FlakeLockFlags::new(&mut settings)?;441		fetch: &FetchSettings,
442		flake: &FlakeSettings,
443		lock: &FlakeLockFlags,
444	) -> Result<LockedFlake> {
439		with_default_context(|c, es| unsafe {445		with_default_context(|c, es| unsafe { flake_lock(c, fetch.0, flake.0, es, lock.0, self.0) })
440			flake_lock(c, fetch.0, settings.0, es, lock_flags.0, self.0)
441		})
442		.map(LockedFlake)446			.map(LockedFlake)
443	}447	}
611			.expect("get_type should not fail");615			.expect("get_type should not fail");
612		NixType::from_int(ty)616		NixType::from_int(ty)
613	}617	}
618	fn builtin_to_string(&self) -> Result<Self> {
619		let builtin = Self::eval("builtins.toString")?;
620		builtin.call(self.clone())
621	}
614	pub fn to_string(&self) -> Result<String> {622	pub fn to_string(&self) -> Result<String> {
623		let mut str_out = String::new();
624		with_default_context(|c, _| unsafe {
615		Ok(self.to_realised_string()?.as_str().to_owned())625			get_string(c, self.0, Some(copy_nix_str), (&raw mut str_out).cast())
626		})?;
627
628		Ok(str_out)
616	}629	}
617	pub fn to_realised_string(&self) -> Result<RealisedString> {630	pub fn to_realised_string(&self) -> Result<RealisedString> {
618		with_default_context(|c, es| unsafe { nix_raw::string_realise(c, es, self.0, false) })631		with_default_context(|c, es| unsafe { nix_raw::string_realise(c, es, self.0, false) })
751			self.clone()764			self.clone()
752		};765		};
753		// to_string here blocks until the path is built766		// to_string here blocks until the path is built
754		let drv_path = tokio::task::spawn_blocking(move || v.get_field("outPath")?.to_string())767		let drv_path =
768			tokio::task::spawn_blocking(move || v.builtin_to_string()?.to_realised_string())
755			.await769				.await
756			.expect("should not fail")?;770				.expect("spawn should not fail")?;
757		Ok(PathBuf::from(drv_path))771		Ok(PathBuf::from(drv_path.as_str()))
758	}772	}
759	pub fn as_json<T: DeserializeOwned>(&self) -> Result<T> {773	pub fn as_json<T: DeserializeOwned>(&self) -> Result<T> {
760		let to_json = Self::eval("builtins.toJSON")?;774		let to_json = Self::eval("builtins.toJSON")?;
835849
836pub fn init_libraries() {850pub fn init_libraries() {
837	unsafe { nix_raw::GC_allow_register_threads() };851	unsafe { nix_raw::GC_allow_register_threads() };
852	unsafe {
853		nix_raw::GC_init();
854	};
838855
839	let mut ctx = NixContext::new();856	let mut ctx = NixContext::new();
840	ctx.run_in_context(|c| unsafe { nix_raw::libutil_init(c) })857	ctx.run_in_context(|c| unsafe { nix_raw::libutil_init(c) })

--- a/crates/nix-eval/src/logging.cc
+++ b/crates/nix-eval/src/logging.cc
@@ -60,5 +60,6 @@
 extern "C" {
 void apply_tracing_logger() {
   logger = std::make_unique<TracingLogger>();
+  // verbosity = lvlVomit;
 }
 }

--- a/crates/nix-eval/src/logging.rs
+++ b/crates/nix-eval/src/logging.rs
@@ -8,6 +8,7 @@
 };
 #[cfg(feature = "indicatif")]
 use tracing_indicatif::span_ext::IndicatifSpanExt as _;
+use vte::Parser;
 
 #[derive(Debug)]
 enum ActivityType {
@@ -374,6 +375,7 @@
 			}
 		};
 		if !s.trim().is_empty() {
+			let s = ansi_filter(s);
 			#[cfg(feature = "indicatif")]
 			{
 				span.pb_set_message(s);
@@ -413,7 +415,8 @@
 		match (&res, self.fields.as_slice()) {
 			// ResultType::FileLinked => todo!(),
 			(ResultType::BuildLogLine, [Str(s)]) => {
-				info!("{s:?}");
+				let s = ansi_filter(s);
+				info!("{s}");
 			}
 			// ResultType::UntrustedPath => todo!(),
 			// ResultType::CorruptedPath => todo!(),
@@ -468,6 +471,68 @@
 	}
 }
 
+struct AnsiFiltered {
+	output: String,
+}
+impl vte::Perform for AnsiFiltered {
+	fn print(&mut self, c: char) {
+		self.output.push(c);
+	}
+
+	fn execute(&mut self, byte: u8) {
+		// We don't want \r, bells, etc
+		if byte == b'\n' {
+			self.output.push('\n');
+		} else if byte == b'\t' {
+			// TODO: align output to the correct multiplier?
+			self.output.push('\t');
+		}
+	}
+
+	fn osc_dispatch(&mut self, _params: &[&[u8]], _bell_terminated: bool) {}
+	fn esc_dispatch(&mut self, _intermediates: &[u8], _ignore: bool, _byte: u8) {}
+
+	fn csi_dispatch(
+		&mut self,
+		params: &vte::Params,
+		_intermediates: &[u8],
+		_ignore: bool,
+		action: char,
+	) {
+		use std::fmt::Write;
+		if action != 'm' {
+			// Only plain colors are enabled, everything other might corrupt the output
+			return;
+		}
+		self.output.push_str("IDK\x1b[");
+		for (i, par) in params.iter().enumerate() {
+			if i != 0 {
+				let _ = write!(self.output, ";");
+			}
+			for (i, sub) in par.iter().enumerate() {
+				if i != 0 {
+					let _ = write!(self.output, ":");
+				}
+				let _ = write!(self.output, "{sub}");
+			}
+		}
+		self.output.push(action);
+	}
+}
+fn ansi_filter(i: &str) -> String {
+	let mut out = AnsiFiltered {
+		output: String::new(),
+	};
+	let mut parser = Parser::new();
+
+	// For some reason it gets stuck with longer inputs
+	for chunk in i.as_bytes().chunks(50) {
+		parser.advance(&mut out, chunk);
+	}
+
+	out.output
+}
+
 #[cxx::bridge]
 pub mod nix_logging_cxx {
 	extern "Rust" {

--- a/flake.lock
+++ b/flake.lock
@@ -104,10 +104,10 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1757000273,
+        "lastModified": 1757031817,
         "owner": "deltarocks",
         "repo": "nix",
-        "rev": "eba1f549ec21208cf98343f1351a95e2e6eb3fbb",
+        "rev": "2261305161dc02496c8aedcdda14ace04b9b1dc1",
         "type": "github"
       },
       "original": {

--- a/lib/flakePart.nix
+++ b/lib/flakePart.nix
@@ -65,25 +65,28 @@
           normalEval = bootstrapNixpkgs.lib.evalModules {
             modules = (import ../modules/module-list.nix) ++ [
               module
-              ({inputs', ...}: {
-                config = {
-                  data = if isPath data then import data else data;
-                  nixpkgs.buildUsing = mkOptionDefault bootstrapNixpkgs;
-                  nixpkgs.overlays = [
-                    (final: prev: {
-                      inherit
-                        (import ../pkgs {
-                          inherit (prev) callPackage;
-                          inherit inputs';
-                          craneLib = crane.mkLib prev;
-                        })
-                        fleet-install-secrets
-                        fleet-generator-helper
-                        ;
-                    })
-                  ];
-                };
-              })
+              (
+                { inputs', ... }:
+                {
+                  config = {
+                    data = if isPath data then import data else data;
+                    nixpkgs.buildUsing = mkOptionDefault bootstrapNixpkgs;
+                    nixpkgs.overlays = [
+                      (final: prev: {
+                        inherit
+                          (import ../pkgs {
+                            inherit (prev) callPackage;
+                            inherit inputs';
+                            craneLib = crane.mkLib prev;
+                          })
+                          fleet-install-secrets
+                          fleet-generator-helper
+                          ;
+                      })
+                    ];
+                  };
+                }
+              )
             ];
             specialArgs = {
               inherit inputs self;