difftreelog
refactor cleanup bindings
in: trunk
12 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -729,22 +729,6 @@
]
[[package]]
-name = "ctor"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67773048316103656a637612c4a62477603b777d91d9c62ff2290f9cde178fdb"
-dependencies = [
- "ctor-proc-macro",
- "dtor",
-]
-
-[[package]]
-name = "ctor-proc-macro"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2931af7e13dc045d8e9d26afccc6fa115d64e115c9c84b1166288b46f6782c2"
-
-[[package]]
name = "ctr"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -916,21 +900,6 @@
]
[[package]]
-name = "dtor"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e58a0764cddb55ab28955347b45be00ade43d4d6f3ba4bf3dc354e4ec9432934"
-dependencies = [
- "dtor-proc-macro",
-]
-
-[[package]]
-name = "dtor-proc-macro"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5"
-
-[[package]]
name = "ed25519"
version = "2.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1973,17 +1942,12 @@
version = "0.1.0"
dependencies = [
"anyhow",
- "better-command",
"bindgen",
- "ctor",
"cxx",
"cxx-build",
- "futures",
"itertools 0.14.0",
"nixlike",
"pkg-config",
- "r2d2",
- "regex",
"serde",
"serde_json",
"test-log",
@@ -1992,7 +1956,6 @@
"tokio-util",
"tracing",
"tracing-indicatif",
- "unindent",
]
[[package]]
@@ -2454,17 +2417,6 @@
version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
-
-[[package]]
-name = "r2d2"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93"
-dependencies = [
- "log",
- "parking_lot",
- "scheduled-thread-pool",
-]
[[package]]
name = "rand"
@@ -2829,15 +2781,6 @@
]
[[package]]
-name = "scheduled-thread-pool"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19"
-dependencies = [
- "parking_lot",
-]
-
-[[package]]
name = "scopeguard"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3673,12 +3616,6 @@
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
-
-[[package]]
-name = "unindent"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
[[package]]
name = "unit-prefix"
cmds/fleet/Cargo.tomldiffbeforeafterboth--- a/cmds/fleet/Cargo.toml
+++ b/cmds/fleet/Cargo.toml
@@ -55,4 +55,5 @@
"dep:indicatif",
"dep:human-repr",
"better-command/indicatif",
+ "nix-eval/indicatif",
]
cmds/fleet/src/cmds/build_systems.rsdiffbeforeafterboth--- a/cmds/fleet/src/cmds/build_systems.rs
+++ b/cmds/fleet/src/cmds/build_systems.rs
@@ -28,18 +28,12 @@
build_attr: String,
}
-async fn build_task(
- config: Config,
- hostname: String,
- build_attr: &str,
- // batch: Option<NixBuildBatch>,
-) -> Result<PathBuf> {
+async fn build_task(config: Config, hostname: String, build_attr: &str) -> Result<PathBuf> {
info!("building");
let host = config.host(&hostname).await?;
// let action = Action::from(self.subcommand.clone());
let nixos = host.nixos_config().await?;
let drv = nix_go!(nixos.system.build[{ build_attr }]);
- // let outputs = drv.build_maybe_batch(batch).await?;
let out_output = drv.build("out").await?;
// We already have system profiles for backups.
@@ -66,17 +60,11 @@
let hosts = opts.filter_skipped(config.list_hosts().await?).await?;
let set = LocalSet::new();
let build_attr = self.build_attr.clone();
- // let batch = (hosts.len() > 1).then(|| {
- // config
- // .nix_session
- // .new_build_batch("build-hosts".to_string())
- // });
for host in hosts {
let config = config.clone();
let span = info_span!("build", host = field::display(&host.name));
let hostname = host.name;
let build_attr = build_attr.clone();
- // let batch = batch.clone();
set.spawn_local(
(async move {
let built = match build_task(config, hostname.clone(), &build_attr).await {
@@ -107,11 +95,6 @@
pub async fn run(self, config: &Config, opts: &FleetOpts) -> Result<()> {
let hosts = opts.filter_skipped(config.list_hosts().await?).await?;
let set = LocalSet::new();
- // let batch = (hosts.len() > 1).then(|| {
- // config
- // .nix_session
- // .new_build_batch("deploy-hosts".to_string())
- // });
for host in hosts.into_iter() {
let config = config.clone();
let span = info_span!("deploy", host = field::display(&host.name));
cmds/fleet/src/cmds/secrets/mod.rsdiffbeforeafterboth--- a/cmds/fleet/src/cmds/secrets/mod.rs
+++ b/cmds/fleet/src/cmds/secrets/mod.rs
@@ -169,7 +169,6 @@
expected_owners: &[String],
expected_generation_data: serde_json::Value,
prefer_identities: &[String],
- // batch: Option<NixBuildBatch>,
) -> Result<FleetSharedSecret> {
let original_set = secret.owners.clone();
@@ -207,12 +206,10 @@
field,
expected_owners.to_vec(),
expected_generation_data,
- // batch,
)
.await?;
Ok(generated)
} else {
- // drop(batch);
let identity_holder = if !prefer_identities.is_empty() {
prefer_identities
.iter()
@@ -264,7 +261,6 @@
default_generator: Value,
expected_owners: &[String],
expected_generation_data: serde_json::Value,
- // batch: Option<NixBuildBatch>,
) -> Result<FleetSecret> {
let generator = nix_go!(secret.generator);
let on: Option<String> = nix_go_json!(default_generator.impureOn);
@@ -292,7 +288,6 @@
let generator = nix_go!(call_package(generator)(Obj {}));
- // let generator = generator.build_maybe_batch(batch).await?;
let generator = generator.build("out").await?;
let generator = host.remote_derivation(&generator).await?;
@@ -347,12 +342,11 @@
secret: Value,
expected_owners: &[String],
expected_generation_data: serde_json::Value,
- // batch: Option<NixBuildBatch>,
) -> Result<FleetSecret> {
let generator = nix_go!(secret.generator);
// Can't properly check on nix module system level
{
- let gen_ty = generator.type_of()?;
+ let gen_ty = generator.type_of();
if matches!(gen_ty, NixType::Null) {
bail!("secret has no generator defined, can't automatically generate it.");
}
@@ -394,7 +388,6 @@
default_generator,
expected_owners,
expected_generation_data,
- // batch,
)
.await
}
@@ -416,7 +409,6 @@
secret: Value,
expected_owners: Vec<String>,
expected_generation_data: serde_json::Value,
- // batch: Option<NixBuildBatch>,
) -> Result<FleetSharedSecret> {
// let owners: Vec<String> = nix_go_json!(secret.expectedOwners);
Ok(FleetSharedSecret {
@@ -426,7 +418,6 @@
secret,
&expected_owners,
expected_generation_data,
- // batch,
)
.await?,
owners: expected_owners,
@@ -747,7 +738,6 @@
let stored_shared_set = config.list_shared().into_iter().collect::<HashSet<_>>();
{
// Generate missing shared
- // let shared_batch = None;
let _span = info_span!("shared").entered();
let expected_shared_set = config
.list_configured_shared()
@@ -772,7 +762,6 @@
secret,
expected_owners,
expected_generation_data,
- // shared_batch.clone(),
)
.in_current_span()
.await?;
@@ -780,7 +769,6 @@
}
}
if !skip_hosts {
- // let hosts_batch = None;
for host in config.list_hosts().await? {
if opts.should_skip(&host).await? {
continue;
@@ -808,7 +796,6 @@
secret,
slice::from_ref(&host.name),
expected_generation_data,
- // hosts_batch.clone(),
)
.in_current_span()
.await
@@ -834,7 +821,6 @@
secret,
slice::from_ref(&host.name),
expected_generation_data,
- // hosts_batch.clone(),
)
.in_current_span()
.await
cmds/fleet/src/cmds/tf.rsdiffbeforeafterboth--- a/cmds/fleet/src/cmds/tf.rs
+++ b/cmds/fleet/src/cmds/tf.rs
@@ -1,8 +1,4 @@
-use std::{
- collections::{BTreeMap, HashMap},
- ffi::OsString,
- path::PathBuf,
-};
+use std::{collections::BTreeMap, ffi::OsString, path::PathBuf};
use anyhow::{Context, Result};
use clap::Parser;
crates/nix-eval/Cargo.tomldiffbeforeafterboth--- a/crates/nix-eval/Cargo.toml
+++ b/crates/nix-eval/Cargo.toml
@@ -7,26 +7,23 @@
[dependencies]
anyhow.workspace = true
-better-command.workspace = true
nixlike.workspace = true
serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
thiserror.workspace = true
-tokio = { workspace = true, features = ["io-util", "process"] }
+tokio = { workspace = true }
tokio-util.workspace = true
tracing.workspace = true
cxx = "1.0.168"
-futures = "0.3.31"
itertools = "0.14.0"
-r2d2 = "0.8.10"
-regex = "1.11.1"
test-log = { version = "0.2.18", features = ["trace"] }
-unindent = "0.2.4"
-tracing-indicatif = "0.3.13"
-ctor = "0.5.0"
+tracing-indicatif = { version = "0.3.13", optional = true }
[build-dependencies]
bindgen = "0.72.0"
cxx-build = "1.0.168"
pkg-config = "0.3.30"
+
+[features]
+indicatif = ["dep:tracing-indicatif"]
crates/nix-eval/src/lib.rsdiffbeforeafterboth1//! This whole library should be replaced with either binding to nix libexpr,2//! or with tvix (once it is able to build NixOS).3//!4//! Current api is awful, little effort was put into this implementation.56use std::borrow::Cow;1use std::borrow::Cow;7use std::cell::RefCell;2use std::cell::RefCell;11use std::sync::LazyLock;6use std::sync::LazyLock;12use std::{collections::HashMap, path::PathBuf};7use std::{collections::HashMap, path::PathBuf};13814use anyhow::{Context, bail};9use anyhow::{Context, anyhow, bail};15use serde::Serialize;10use serde::Serialize;16use serde::de::DeserializeOwned;11use serde::de::DeserializeOwned;171227 flake_reference_parse_flags_new, flake_reference_parse_flags_set_base_directory,22 flake_reference_parse_flags_new, flake_reference_parse_flags_set_base_directory,28 flake_settings, flake_settings_free, flake_settings_new, init_bool, init_int, init_string,23 flake_settings, flake_settings_free, flake_settings_new, init_bool, init_int, init_string,29 locked_flake_free, locked_flake_get_output_attrs, set_err_msg, setting_set, state_free,24 locked_flake_free, locked_flake_get_output_attrs, set_err_msg, setting_set, state_free,30 value_decref, value_force, value_incref,25 value_decref, value_incref,31};26};322733mod value;34// Contains macros helpers28// Contains macros helpers35pub mod logging;29pub mod logging;36#[doc(hidden)]30#[doc(hidden)]37pub mod macros;31pub mod macros;38pub mod util;32pub mod util;393340#[allow(non_upper_case_globals, non_camel_case_types, non_snake_case)]34#[allow(35 non_upper_case_globals,36 non_camel_case_types,37 non_snake_case,38 dead_code39)]41mod nix_raw {40mod nix_raw {42 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));41 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));88 }87 }89}88}8990enum FunctorKind {91 Function,92 Functor,93}909491#[derive(Debug)]95#[derive(Debug)]92#[repr(i32)]96#[repr(i32)]130 unsafe { nix_raw::GC_unregister_my_thread() };134 unsafe { nix_raw::GC_unregister_my_thread() };131}135}132136133struct ThreadRegisterGuard {}137pub struct ThreadRegisterGuard {}134impl ThreadRegisterGuard {138impl ThreadRegisterGuard {135 fn new() -> Self {139 pub fn new() -> Self {136 gc_register_my_thread();140 gc_register_my_thread();137 Self {}141 Self {}138 }142 }143 }147 }144}148}145149146struct NixContext(*mut c_context);150pub struct NixContext(*mut c_context);147impl NixContext {151impl NixContext {148 fn set_err(&mut self, err: NixErrorKind, msg: &CStr) {152 pub fn set_err(&mut self, err: NixErrorKind, msg: &CStr) {149 unsafe { set_err_msg(self.0, err as c_int, msg.as_ptr()) };153 unsafe { set_err_msg(self.0, err as c_int, msg.as_ptr()) };150 }154 }151 fn new() -> Self {155 pub fn new() -> Self {152 let ctx = unsafe { c_context_create() };156 let ctx = unsafe { c_context_create() };153 Self(ctx)157 Self(ctx)154 }158 }175 let str = unsafe { nix_raw::err_msg(null_mut(), self.0, null_mut()) };179 let str = unsafe { nix_raw::err_msg(null_mut(), self.0, null_mut()) };176 Some(unsafe { CStr::from_ptr(str) }.to_string_lossy())180 Some(unsafe { CStr::from_ptr(str) }.to_string_lossy())177178 // TODO: There is also nix_err_info_msg, but I don't understand when it should be used179 // Some(match self.error_kind()? {180 // NixErrorKind::Generic => {181 // }182 // })183 }181 }184 fn clean_err(&mut self) {182 fn clean_err(&mut self) {185 unsafe {183 unsafe {210 }208 }211}209}212struct GlobalState {210struct GlobalState {211 // Store should be valid as long as EvalState is valid212 #[allow(dead_code)]213 store: Store,213 store: Store,214 state: EvalState,214 state: EvalState,215}215}269 v269 v270}270}271271272fn set_setting(s: &CStr, v: &CStr) -> Result<()> {272pub fn set_setting(s: &CStr, v: &CStr) -> Result<()> {273 with_default_context(|c, _| unsafe { setting_set(c, s.as_ptr(), v.as_ptr()) }).map(|_| ())273 with_default_context(|c, _| unsafe { setting_set(c, s.as_ptr(), v.as_ptr()) }).map(|_| ())274}274}275275290unsafe impl Send for FetchSettings {}290unsafe impl Send for FetchSettings {}291unsafe impl Sync for FetchSettings {}291unsafe impl Sync for FetchSettings {}292293impl Default for FetchSettings {294 fn default() -> Self {295 Self::new()296 }297}298292impl Drop for FetchSettings {299impl Drop for FetchSettings {293 fn drop(&mut self) {300 fn drop(&mut self) {310 }317 }311}318}312319313struct FlakeReferenceParseFlags(*mut flake_reference_parse_flags);320pub struct FlakeReferenceParseFlags(*mut flake_reference_parse_flags);314impl FlakeReferenceParseFlags {321impl FlakeReferenceParseFlags {315 fn new(settings: &mut FlakeSettings) -> Result<Self> {322 pub fn new(settings: &mut FlakeSettings) -> Result<Self> {316 with_default_context(|c, _| unsafe { flake_reference_parse_flags_new(c, settings.0) })323 with_default_context(|c, _| unsafe { flake_reference_parse_flags_new(c, settings.0) })317 .map(Self)324 .map(Self)318 }325 }319 fn set_base_dir(&mut self, dir: &str) -> Result<()> {326 pub fn set_base_dir(&mut self, dir: &str) -> Result<()> {320 with_default_context(|c, _| {327 with_default_context(|c, _| {321 unsafe {328 unsafe {322 flake_reference_parse_flags_set_base_directory(329 flake_reference_parse_flags_set_base_directory(361unsafe impl Sync for Store {}368unsafe impl Sync for Store {}362369363struct EvalState(*mut nix_raw::EvalState);370struct EvalState(*mut nix_raw::EvalState);364impl EvalState {365 // TODO: store ownership366 fn new_raw(store: *mut nix_raw::Store) -> Result<Self> {367 let builder =368 with_default_context(|c, _| unsafe { nix_raw::eval_state_builder_new(c, store) })?;369370 with_default_context(|c, _| unsafe { eval_state_build(c, builder) }).map(Self)371372 // with_default_context(|c| state_create(c))373 }374}375unsafe impl Send for EvalState {}371unsafe impl Send for EvalState {}376unsafe impl Sync for EvalState {}372unsafe impl Sync for EvalState {}373386impl FlakeReference {383impl FlakeReference {387 pub fn new(s: &str, fetch: &FetchSettings) -> Result<(Self, String)> {384 pub fn new(s: &str, fetch: &FetchSettings) -> Result<(Self, String)> {388 let mut flake_settings = FlakeSettings::new()?;385 let mut flake_settings = FlakeSettings::new()?;389 let mut parse_flags = FlakeReferenceParseFlags::new(&mut flake_settings)?;386 let parse_flags = FlakeReferenceParseFlags::new(&mut flake_settings)?;390391 // parse_flags.set_base_dir("/home/lach/build/fleet")?;392387393 let mut out = null_mut();388 let mut out = null_mut();394 let mut fragment = String::new();389 let mut fragment = String::new();461}456}462457463impl RealisedString {458impl RealisedString {464 fn as_str(&self) -> &str {459 pub fn as_str(&self) -> &str {465 let len = unsafe { nix_raw::realised_string_get_buffer_size(self.0) };460 let len = unsafe { nix_raw::realised_string_get_buffer_size(self.0) };466 let data: *const u8 = unsafe { nix_raw::realised_string_get_buffer_start(self.0) }.cast();461 let data: *const u8 = unsafe { nix_raw::realised_string_get_buffer_start(self.0) }.cast();467 let data = unsafe { std::slice::from_raw_parts(data, len) };462 let data = unsafe { std::slice::from_raw_parts(data, len) };468 std::str::from_utf8(data).expect("non-utf8 strings not supported")463 std::str::from_utf8(data).expect("non-utf8 strings not supported")469 }464 }470 fn path_count(&self) -> usize {465 pub fn path_count(&self) -> usize {471 unsafe { nix_raw::realised_string_get_store_path_count(self.0) }466 unsafe { nix_raw::realised_string_get_store_path_count(self.0) }472 }467 }473 fn path(&self, i: usize) -> String {468 pub fn path(&self, i: usize) -> String {474 assert!(i < self.path_count());469 assert!(i < self.path_count());475 let path = unsafe { nix_raw::realised_string_get_store_path(self.0, i) };470 let path = unsafe { nix_raw::realised_string_get_store_path(self.0, i) };476 let mut err_out = String::new();471 let mut err_out = String::new();482unsafe impl Send for RealisedString {}477unsafe impl Send for RealisedString {}483impl Drop for RealisedString {478impl Drop for RealisedString {484 fn drop(&mut self) {479 fn drop(&mut self) {485 with_default_context(|c, _| unsafe { nix_raw::realised_string_free(self.0) })480 unsafe { nix_raw::realised_string_free(self.0) }486 .expect("string free should not fail")487 }481 }488}482}489483541}535}542536543impl Value {537impl Value {544 pub fn new_attrs(v: HashMap<&str, Value>) -> Result<Self> {538 pub fn new_attrs(v: HashMap<&str, Value>) -> Self {545 let out = Self::new_uninit()?;539 let out = Self::new_uninit();546 let mut b = AttrsBuilder::new(v.len());540 let mut b = AttrsBuilder::new(v.len());547 for (k, v) in v {541 for (k, v) in v {548 b.insert(&k, v);542 b.insert(&k, v);549 }543 }550 with_default_context(|c, _| unsafe { nix_raw::make_attrs(c, out.0, b.0) })?;544 with_default_context(|c, _| unsafe { nix_raw::make_attrs(c, out.0, b.0) })545 .expect("attrs initialization should not fail");551 Ok(out)546 out552 }547 }553 fn new_list<T: Into<Self>>(v: Vec<T>) -> Result<Self> {548 fn new_list<T: Into<Self>>(v: Vec<T>) -> Self {554 todo!()549 todo!()555 }550 }556 fn new_uninit() -> Result<Self> {551 fn new_uninit() -> Self {557 let out = with_default_context(|c, es| unsafe { alloc_value(c, es) })?;552 let out = with_default_context(|c, es| unsafe { alloc_value(c, es) })553 .expect("value allocation should not fail");558 Ok(Self(out))554 Self(out)559 }555 }560 fn new_str(v: &str) -> Result<Self> {556 pub fn new_str(v: &str) -> Self {561 let s = CString::new(v).expect("string should not contain NULs");557 let s = CString::new(v).expect("string should not contain NULs");562 let uninit = Self::new_uninit()?;558 let out = Self::new_uninit();563 // String is copied, `s` is free to be dropped559 // String is copied, `s` is free to be dropped564 with_default_context(|c, _| unsafe { init_string(c, uninit.0, s.as_ptr()) })?;560 with_default_context(|c, _| unsafe { init_string(c, out.0, s.as_ptr()) })565 Ok(uninit)561 .expect("string initialization should not fail");562 out566 }563 }567 fn new_int(i: i64) -> Result<Self> {564 pub fn new_int(i: i64) -> Self {568 let uninit = Self::new_uninit()?;565 let out = Self::new_uninit();569 with_default_context(|c, _| unsafe { init_int(c, uninit.0, i) })?;566 with_default_context(|c, _| unsafe { init_int(c, out.0, i) })570 Ok(uninit)567 .expect("int initialization should not fail");568 out571 }569 }572 fn new_bool(v: bool) -> Result<Self> {570 pub fn new_bool(v: bool) -> Self {573 let uninit = Self::new_uninit()?;571 let out = Self::new_uninit();574 with_default_context(|c, _| unsafe { init_bool(c, uninit.0, v) })?;572 with_default_context(|c, _| unsafe { init_bool(c, out.0, v) })575 Ok(uninit)573 .expect("bool initialization should not fail");574 out576 }575 }577 fn force(&mut self, st: &mut EvalState) -> Result<()> {576 // TODO: As far as I can see, there is no way to get Thunks from nix public C api, so this function is useless578 with_default_context(|c, _| unsafe { value_force(c, st.0, self.0) })?;577 // fn force(&mut self, st: &mut EvalState) -> Result<()> {579 Ok(())578 // with_default_context(|c, _| unsafe { value_force(c, st.0, self.0) })?;580 }579 // Ok(())580 // }581 pub fn type_of(&self) -> Result<NixType> {581 pub fn type_of(&self) -> NixType {582 let ty = with_default_context(|c, _| unsafe { nix_raw::get_type(c, self.0) })?;582 let ty = with_default_context(|c, _| unsafe { nix_raw::get_type(c, self.0) })583 .expect("get_type should not fail");583 Ok(NixType::from_int(ty))584 NixType::from_int(ty)584 }585 }585 pub fn to_string(&self) -> Result<String> {586 pub fn to_string(&self) -> Result<String> {586 Ok(self.to_realised_string()?.as_str().to_owned())587 Ok(self.to_realised_string()?.as_str().to_owned())608 // nix_raw::real609 // nix_raw::real609 // }610 // }610 pub fn list_fields(&self) -> Result<Vec<String>> {611 pub fn list_fields(&self) -> Result<Vec<String>> {611 if !matches!(self.type_of()?, NixType::Attrs) {612 if !matches!(self.type_of(), NixType::Attrs) {612 bail!("invalid type: expected attrs");613 bail!("invalid type: expected attrs");613 }614 }614615625 Ok(out)626 Ok(out)626 }627 }627 pub fn get_elem(&self, v: usize) -> Result<Self> {628 pub fn get_elem(&self, v: usize) -> Result<Self> {628 if !matches!(self.type_of()?, NixType::List) {629 if !matches!(self.type_of(), NixType::List) {629 bail!("invalid type: expected list");630 bail!("invalid type: expected list");630 }631 }631 let len =632 let len =659 for f in b_fields.iter() {660 for f in b_fields.iter() {660 out.insert(f.as_str(), other.get_field(f)?);661 out.insert(f.as_str(), other.get_field(f)?);661 }662 }662 Self::new_attrs(out)663 Ok(Self::new_attrs(out))663 }664 }664 pub fn get_field(&self, name: impl AsFieldName) -> Result<Self> {665 pub fn get_field(&self, name: impl AsFieldName) -> Result<Self> {665 if !matches!(self.type_of()?, NixType::Attrs) {666 if !matches!(self.type_of(), NixType::Attrs) {666 bail!("invalid type: expected attrs");667 bail!("invalid type: expected attrs");667 }668 }668669675 .with_context(|| format!("getting field {:?}", name.to_field_name()))676 .with_context(|| format!("getting field {:?}", name.to_field_name()))676 }677 }677 pub fn call(&self, v: Value) -> Result<Self> {678 pub fn call(&self, v: Value) -> Result<Self> {679 let kind = self680 .functor_kind()681 .ok_or_else(|| anyhow!("can only call function or functor"))?;682683 let function = match kind {684 FunctorKind::Function => self.clone(),685 FunctorKind::Functor => {686 let f = self.get_field("__functor")?;678 if !matches!(self.type_of()?, NixType::Function) {687 assert_eq!(679 // TODO: Functors688 f.type_of(),689 NixType::Function,690 "invalid functor encountered"691 );692 f693 }680 bail!("invalid type: expected function");694 };681 }682695683 let out = Value::new_uninit()?;696 let out = Value::new_uninit();684 with_default_context(|c, es| unsafe { nix_raw::value_call(c, es, self.0, v.0, out.0) })?;697 with_default_context(|c, es| unsafe {698 nix_raw::value_call(c, es, function.0, v.0, out.0)699 })?;685700686 Ok(out)701 Ok(out)687 }702 }688 pub fn eval(v: &str) -> Result<Self> {703 pub fn eval(v: &str) -> Result<Self> {689 let s = CString::new(v).expect("expression shouldn't have internal NULs");704 let s = CString::new(v).expect("expression shouldn't have internal NULs");690 let out = Self::new_uninit()?;705 let out = Self::new_uninit();691 with_default_context(|c, es| unsafe {706 with_default_context(|c, es| unsafe {692 expr_eval_from_string(c, es, s.as_ptr(), c"/homeless-shelter".as_ptr(), out.0)707 expr_eval_from_string(c, es, s.as_ptr(), c"/homeless-shelter".as_ptr(), out.0)693 })?;708 })?;723 }738 }724739725 // Convert to string/evaluate derivations/etc740 // Convert to string/evaluate derivations/etc726 fn to_string_weak(&self) -> Result<String> {741 // fn to_string_weak(&self) -> Result<String> {727 // TODO742 // // TODO: For now, it works exactly like to_string, see the comment for fn force()728 self.to_string()743 // self.to_string()729 }744 // }730745731 fn is_derivation(&self) -> bool {746 fn is_derivation(&self) -> bool {732 if !matches!(self.type_of(), Ok(NixType::Attrs)) {747 if !matches!(self.type_of(), NixType::Attrs) {733 return false;748 return false;734 }749 }735 let Some(ty) = self.get_field("type").ok() else {750 let Some(ty) = self.get_field("type").ok() else {736 return false;751 return false;737 };752 };738 matches!(ty.to_string().as_deref(), Ok("derivation"))753 matches!(ty.to_string().as_deref(), Ok("derivation"))739 }754 }755 fn functor_kind(&self) -> Option<FunctorKind> {756 match self.type_of() {757 NixType::Attrs => self758 .has_field("__functor")759 .expect("has_field shouldn't fail for attrs")760 .then_some(FunctorKind::Functor),761 NixType::Function => Some(FunctorKind::Function),762 _ => None,763 }764 }765 pub fn is_function(&self) -> bool {766 self.functor_kind().is_some()767 }740}768}741769742impl From<String> for Value {770impl From<String> for Value {743 fn from(value: String) -> Self {771 fn from(value: String) -> Self {744 Value::new_str(&value).expect("todo: TryFrom")772 Value::new_str(&value)745 }773 }746}774}747impl From<bool> for Value {775impl From<bool> for Value {748 fn from(value: bool) -> Self {776 fn from(value: bool) -> Self {749 Value::new_bool(value).expect("todo: TryFrom")777 Value::new_bool(value)750 }778 }751}779}752impl From<&str> for Value {780impl From<&str> for Value {753 fn from(value: &str) -> Self {781 fn from(value: &str) -> Self {754 Value::new_str(&value).expect("todo: TryFrom")782 Value::new_str(value)755 }783 }756}784}757impl<T> From<Vec<T>> for Value785impl<T> From<Vec<T>> for Value758where786where759 T: Into<Value>,787 T: Into<Value>,760{788{761 fn from(value: Vec<T>) -> Self {789 fn from(value: Vec<T>) -> Self {762 Value::new_list(value).expect("todo: TryFrom")790 Value::new_list(value)763 }791 }764}792}765793793821794#[test_log::test]822#[test_log::test]795fn test_native() -> Result<()> {823fn test_native() -> Result<()> {824 init_libraries();825796 let mut fetch_settings = FetchSettings::new();826 let mut fetch_settings = FetchSettings::new();797 fetch_settings.set(c"warn-dirty", c"false");827 fetch_settings.set(c"warn-dirty", c"false");798 //828799829 let manifest = format!("{}/../../", env!("CARGO_MANIFEST_DIR"));800 let (mut r, _) = FlakeReference::new("/home/lach/build/fleet", &fetch_settings)?;830 let (mut r, _) = FlakeReference::new(&manifest, &fetch_settings)?;801 let locked = r.lock(&fetch_settings)?;831 let locked = r.lock(&fetch_settings)?;802 let attrs = locked.get_attrs(&mut FlakeSettings::new()?)?;832 let attrs = locked.get_attrs(&mut FlakeSettings::new()?)?;803833804 let builtins = Value::eval("builtins")?;834 let builtins = Value::eval("builtins")?;805 dbg!(builtins.type_of()?);835 assert_eq!(builtins.type_of(), NixType::Attrs);806836807 dbg!(attrs.type_of()?);837 assert_eq!(attrs.type_of(), NixType::Attrs);808 dbg!(attrs.list_fields()?);838 let test_data = nix_go!(attrs.testData);839809 dbg!(840 let test_string: String = nix_go_json!(test_data.testString);810 attrs841 assert_eq!(test_string, "hello");811 .get_field("packages")?812 .get_field("x86_64-linux")?813 .get_field("fleet")?814 .get_field("outPath")?815 .to_string()816 );817842818 Ok(())843 Ok(())819}844}820821// struct NixBuildTask(Value, oneshot::Sender<Result<HashMap<String, PathBuf>>>);822//823// #[derive(Clone)]824// pub struct NixBuildBatch {825// tx: mpsc::UnboundedSender<NixBuildTask>,826// }827//828// #[instrument(skip(values))]829// async fn build_multiple(name: String, values: Vec<Value>) -> Result<()> {830// let builtins = Value::eval("builtins")?;831// let drv = nix_go!(builtins.derivation(Obj {832// // FIXME: pass system from localSystem or fleet args833// // system,834// name,835// builder: "/bin/sh",836// // we want nothing from this derivation, it is only used to perform multiple builds at once.837// args: vec!["-c", "echo > $out"],838// preferLocalBuild: true,839// allowSubstitutes: false,840// buildInputs: values,841// }));842// drv.build()?;843// Ok(())844// }845//846// impl NixBuildBatch {847// fn new(name: String) -> Self {848// let (tx, mut rx) = mpsc::unbounded_channel::<NixBuildTask>();849//850// tokio::task::spawn(async move {851// let mut deps = vec![];852// let mut build_data = vec![];853// while let Some(task) = rx.recv().await {854// build_data.push(task.0.clone());855// deps.push(task);856// }857// if deps.is_empty() {858// return;859// }860// match build_multiple(name, build_data).await {861// Ok(_) => {862// for NixBuildTask(v, o) in deps {863// let _ = o.send(v.build());864// }865// }866// Err(e) => {867// for NixBuildTask(v, o) in deps {868// let s = v.to_string_weak();869// let s = match s {870// Ok(s) => s,871// Err(e) => {872// let _ = o.send(Err(e));873// continue;874// }875// };876// if PathBuf::from(s).exists() {877// let _ = o.send(v.build());878// } else {879// let _ = o.send(Err(e.clone()));880// }881// }882// }883// };884// });885// Self { tx }886// }887// pub async fn submit(self, task: Value) -> Result<HashMap<String, PathBuf>> {888// let Self { tx: task_tx } = self;889// let (tx, rx) = oneshot::channel();890// let _ = task_tx.send(NixBuildTask(task, tx));891// drop(task_tx);892// rx.await.expect("shoudn't be cancelled here")893// }894// }895845crates/nix-eval/src/logging.rsdiffbeforeafterboth--- a/crates/nix-eval/src/logging.rs
+++ b/crates/nix-eval/src/logging.rs
@@ -3,9 +3,10 @@
use std::sync::{LazyLock, Mutex};
use tracing::{
- Level, Metadata, Span, debug, debug_span, error, error_span, event, info, info_span, trace,
- trace_span, warn, warn_span,
+ Level, Span, debug, debug_span, error, error_span, info, info_span, trace, trace_span, warn,
+ warn_span,
};
+#[cfg(feature = "indicatif")]
use tracing_indicatif::span_ext::IndicatifSpanExt as _;
#[derive(Debug)]
@@ -31,8 +32,7 @@
}
fn parse_path(path: &str) -> &str {
- let path = strip_prefix_suffix(path, "\x1b[35;1m", "\x1b[0m").unwrap_or(path);
- path
+ strip_prefix_suffix(path, "\x1b[35;1m", "\x1b[0m").unwrap_or(path)
}
fn parse_drv(drv: &str) -> &str {
@@ -245,9 +245,9 @@
Debug,
Vomit,
}
-impl Into<tracing::Level> for Verbosity {
- fn into(self) -> tracing::Level {
- match self {
+impl From<Verbosity> for tracing::Level {
+ fn from(val: Verbosity) -> Self {
+ match val {
Verbosity::Error => Level::ERROR,
Verbosity::Warn => Level::WARN,
Verbosity::Notice => Level::WARN,
@@ -277,126 +277,9 @@
warn!("unknown log level: {u}");
Verbosity::Vomit
})
- }
-}
-
-#[derive(Hash, PartialEq, Eq, Clone, Copy)]
-enum MetadataKind {
- Span,
- Event,
-}
-// impl MetadataKind {
-// fn kind(&self) -> Kind {
-// match self {
-// MetadataKind::Span => Kind::SPAN,
-// MetadataKind::Event => Kind::EVENT,
-// }
-// }
-// }
-
-#[derive(Hash, PartialEq, Eq)]
-struct ForeignMetadataInfo {
- target: &'static str,
- level: Level,
- kind: MetadataKind,
- name: &'static str,
- module: Option<&'static str>,
- file: Option<&'static str>,
- line: Option<u32>,
- names: &'static [&'static str],
-}
-
-struct FakeCallsite;
-impl tracing::callsite::Callsite for FakeCallsite {
- fn set_interest(&self, interest: tracing::subscriber::Interest) {
- unreachable!()
- }
-
- fn metadata(&self) -> &Metadata<'_> {
- unreachable!()
- }
-}
-const FAKE_CALLSITE: FakeCallsite = FakeCallsite;
-
-#[cfg(false)]
-#[derive(Default)]
-struct ForeignSpanData {
- interned: HashSet<&'static str>,
- metadatas: HashMap<ForeignMetadataInfo, &'static Metadata<'static>>,
-}
-#[cfg(false)]
-impl ForeignSpanData {
- fn intern(&mut self, s: &str) -> &'static str {
- if let Some(v) = self.interned.get(s) {
- return *v;
- }
- let leaked: Box<str> = s.into();
- let leaked = Box::leak(leaked);
- self.interned.insert(leaked);
- return leaked;
- }
- fn alloc_metadata<'t>(
- &'t mut self,
- target: &'static str,
- level: Level,
- kind: MetadataKind,
- name: &'static str,
- module: Option<&'static str>,
- file: Option<&'static str>,
- line: Option<u32>,
- names: &'static [&'static str],
- ) -> &'static Metadata<'static> {
- let info = ForeignMetadataInfo {
- target,
- level,
- kind,
- name,
- module,
- file,
- line,
- names,
- };
- if let Some(v) = self.metadatas.get(&info) {
- return *v;
- }
- let fake = FakeCallsite;
- let metadata = Box::leak::<'static>(Box::new(Metadata::new(
- name,
- target,
- level,
- file,
- line,
- module,
- FieldSet::new(names, tracing::callsite::Identifier(&FAKE_CALLSITE)),
- kind.kind(),
- )));
-
- let meta_raw = &raw const *metadata;
- let fields_raw = &raw const *metadata.fields();
-
- // SAFETY: FieldSet struct should be inside of metadata struct... Which we assume here, but do not test
- // FIXME: Safety comment above might be invalidated at any time, this should actually be covered by unit test (or, better: runtime assertion... Somehow.)
- let fields_offset = unsafe { fields_raw.cast::<u8>().offset_from(meta_raw.cast()) };
- let field_set = unsafe {
- ((&raw mut *metadata).cast::<()>())
- .byte_offset(fields_offset)
- .cast::<FieldSet>()
- };
- // FIXME: metadata borrow here invalidates our &mut borrow of 'static Metadata, and 'static FieldSet so this construction should be replaced with raw pointers or idk.
- // Something should be better done inside of tracing crate itself, someting like interior mutability.
- let callsite = Box::leak(Box::new(tracing::callsite::DefaultCallsite::new(metadata)));
- unsafe { *field_set = FieldSet::new(names, tracing::callsite::Identifier(callsite)) };
-
- tracing::callsite::register(&*callsite);
-
- self.metadatas.insert(info, metadata);
- return metadata;
}
}
-#[cfg(false)]
-static FOREIGN_SPAN_DATA: LazyLock<Mutex<ForeignSpanData>> =
- LazyLock::new(|| Mutex::new(ForeignSpanData::default()));
static NIX_SPAN_MAPPING: LazyLock<Mutex<HashMap<u64, Span>>> =
LazyLock::new(|| Mutex::new(HashMap::new()));
@@ -491,7 +374,10 @@
}
};
if !s.trim().is_empty() {
- span.pb_set_message(s);
+ #[cfg(feature = "indicatif")]
+ {
+ span.pb_set_message(s);
+ }
let _e = span.enter();
let level: Level = self.verbosity.into();
if level == Level::ERROR {
@@ -506,12 +392,15 @@
trace!(target: "nix", "{}", s)
}
} else {
- span.pb_start();
+ #[cfg(feature = "indicatif")]
+ {
+ span.pb_start();
+ }
}
mapping.insert(self.activity_id, span);
}
fn emit_result(&mut self, ty: u32) {
- let mut mapping = NIX_SPAN_MAPPING.lock().expect("not poisoned");
+ let mapping = NIX_SPAN_MAPPING.lock().expect("not poisoned");
let Some(parent) = mapping.get(&self.activity_id) else {
panic!("unexpected result for dead parent");
@@ -536,9 +425,12 @@
// parent.pb_set_message(phase);
debug!(target: "nix::phase", phase)
}
- (ResultType::Progress, [Int(done), Int(expected), Int(_), Int(_)]) => {
- parent.pb_set_length(*expected as u64);
- parent.pb_set_position(*done as u64);
+ (ResultType::Progress, [Int(_done), Int(_expected), Int(_), Int(_)]) => {
+ #[cfg(feature = "indicatif")]
+ {
+ parent.pb_set_length(*_expected as u64);
+ parent.pb_set_position(*_done as u64);
+ }
}
_ => warn!("unknown progress report: {:?}({:?})", &res, &self.fields),
}
@@ -575,10 +467,6 @@
trace!(target: "nix", "{v}")
}
}
-
-// fn start_activity(act: u64, lvl: u32, act_ty: u32, s: &str, parent: u32) {
-// tracing::Span::new(meta, values)
-// }
#[cxx::bridge]
pub mod nix_logging_cxx {
crates/nix-eval/src/macros.rsdiffbeforeafterboth--- a/crates/nix-eval/src/macros.rs
+++ b/crates/nix-eval/src/macros.rs
@@ -20,7 +20,7 @@
use $crate::{nix_expr_inner};
let mut out = std::collections::hash_map::HashMap::new();
nix_expr_inner!(@obj(out) $($tt)*);
- Value::new_attrs(out)?
+ Value::new_attrs(out)
}};
(@field($o:ident) . $var:ident $($tt:tt)*) => {{
$o.index_attr(stringify!($var));
crates/nix-eval/src/value.rsdiffbeforeafterboth--- a/crates/nix-eval/src/value.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use std::{collections::HashMap, fmt, path::PathBuf, sync::Arc};
-
-use better_command::NixHandler;
-use serde::{Serialize, de::DeserializeOwned};
-
-use crate::{Result, Value, nix_go};
flake.lockdiffbeforeafterboth--- a/flake.lock
+++ b/flake.lock
@@ -104,14 +104,18 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
- "lastModified": 1756860322,
- "narHash": "sha256-mT01CpWVdqSm79L270dSkjdYbdc37r+Hq9vk4GTp7Ao=",
- "path": "/home/lach/build/nix-src",
- "type": "path"
+ "lastModified": 1757000273,
+ "narHash": "sha256-9AKhwsSlegWnNFy8++OMNctrxJUUIE7nG4s4ZHmFPic=",
+ "owner": "deltarocks",
+ "repo": "nix",
+ "rev": "eba1f549ec21208cf98343f1351a95e2e6eb3fbb",
+ "type": "github"
},
"original": {
- "path": "/home/lach/build/nix-src",
- "type": "path"
+ "owner": "deltarocks",
+ "ref": "fleet",
+ "repo": "nix",
+ "type": "github"
}
},
"nixpkgs": {
flake.nixdiffbeforeafterboth--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,7 @@
};
# DeterminateSystem's nix fork is controversial, but I don't mind it,
# and it has lazy-trees support which is useful for fleet.
- nix.url = "/home/lach/build/nix-src";
+ nix.url = "github:deltarocks/nix/fleet";
};
outputs =
inputs:
@@ -44,10 +44,13 @@
fleetModules.tf = ./modules/extras/tf.nix;
- testObj = {
- v = "Hello";
+ # Used to test nix-eval bindings
+ testData = {
+ testObj = {
+ v = "Hello";
+ };
+ testString = "hello";
};
- testString = "hello";
# To be used with https://github.com/NixOS/nix/pull/8892
schemas =