Skip to content

worker: attach flake settings for every input kind #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NotAShelf merged 1 commit into from
Oct 2, 2026
Merged

worker: attach flake settings for every input kind #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions crates/evix/src/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ pub async fn run() -> Result<()> {
let ctx = Arc::new(Context::new().context("Nix context")?);
let store = Arc::new(Store::open(&ctx, None).context("Nix store")?);
let eval_options = crate::eval::EvalOptions::from(&config);
let state = build_eval_state(&ctx, &store, &config)?;
let state = build_eval_state(&ctx, &store)?;
let auto_args = build_auto_args(&state, &config.auto_args)?;
let auto_ref = auto_args.as_ref();

Expand Down Expand Up @@ -97,20 +97,19 @@ pub async fn run() -> Result<()> {
Ok(())
}

/// Build a new [`EvalState`] from the given store, attaching flake settings
/// when the input is a flake.
/// Build a new [`EvalState`] from the given store with flake settings attached,
/// so every input kind can call `builtins.getFlake`.
fn build_eval_state(
_ctx: &Arc<Context>,
store: &Arc<Store>,
_config: &WorkerConfig,
) -> Result<EvalState> {
let builder = EvalStateBuilder::new(store).context("eval state builder")?;

#[cfg(feature = "flake")]
let mut builder = builder;

#[cfg(feature = "flake")]
if matches!(_config.input, Input::Flake(_)) {
{
let fs = nix_bindings::flake::FlakeSettings::new(_ctx)
.context("flake settings")?;
builder = builder
Expand Down Expand Up @@ -276,7 +275,7 @@ pub(crate) fn export_locked_flake(config: &Config) -> Result<Option<String>> {

let ctx = Arc::new(Context::new().context("Nix context")?);
let store = Arc::new(Store::open(&ctx, None).context("Nix store")?);
let state = build_eval_state(&ctx, &store, &WorkerConfig::from(config))?;
let state = build_eval_state(&ctx, &store)?;

let flake_settings = flake_settings(&ctx)?;
let fetchers = nix_bindings::flake::FetchersSettings::new(&ctx)
Expand Down
Loading