diff options
| author | Ilan Joselevich <personal@ilanjoselevich.com> | 2024-08-11T21·02+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-08-12T14·50+0000 |
| commit | d2a80dda88317d090f4c8bd65e39cf706a7daa5e (patch) | |
| tree | 92a5e3d9b4777f8a75c1d150e59d5533e0d0c8a7 /tvix/cli/src | |
| parent | fd64df05114ef9dfac6fe46ce990f178c6d207c5 (diff) | |
feat(tvix/cli): Add derivation file dumping functionality r/8482
Provides a derivation file dumping functionality for tvix-cli that can be used when passing the --drv-dumpdir CLI arg to tvix-cli. This will dump all the known derivation files into the specified directory, making it easier to debug derivation divergences between Tvix generated drvs and the drvs generated by Nix. Supersedes: https://cl.tvl.fyi/c/depot/+/11265 Change-Id: I0e10b26eba22032b84ac543af0d4150ad87aed3e Reviewed-on: https://cl.tvl.fyi/c/depot/+/12192 Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com> Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/cli/src')
| -rw-r--r-- | tvix/cli/src/args.rs | 11 | ||||
| -rw-r--r-- | tvix/cli/src/lib.rs | 17 |
2 files changed, 27 insertions, 1 deletions
diff --git a/tvix/cli/src/args.rs b/tvix/cli/src/args.rs index 5b8f6b48b134..36f9a6a262dd 100644 --- a/tvix/cli/src/args.rs +++ b/tvix/cli/src/args.rs @@ -72,4 +72,15 @@ pub struct Args { #[arg(long, env, default_value = "dummy://")] pub build_service_addr: String, + + /// An optional path in which Derivations encountered during evaluation + /// are dumped into, after evaluation. If it doesn't exist, the directory is created. + /// + /// Files dumped there are named like they would show up in `/nix/store`, + /// if produced by Nix. Existing files are not overwritten. + /// + /// This is only for debugging and diffing purposes for post-eval inspection; + /// Tvix does not read from these. + #[clap(long)] + pub drv_dumpdir: Option<PathBuf>, } diff --git a/tvix/cli/src/lib.rs b/tvix/cli/src/lib.rs index 060665480f1e..beb4c505207c 100644 --- a/tvix/cli/src/lib.rs +++ b/tvix/cli/src/lib.rs @@ -112,7 +112,7 @@ pub fn evaluate( eval_builder = eval_builder.add_builtins(impure_builtins()); eval_builder = add_derivation_builtins(eval_builder, Rc::clone(&tvix_store_io)); eval_builder = add_fetcher_builtins(eval_builder, Rc::clone(&tvix_store_io)); - eval_builder = add_import_builtins(eval_builder, tvix_store_io); + eval_builder = add_import_builtins(eval_builder, Rc::clone(&tvix_store_io)); } }; eval_builder = configure_nix_path(eval_builder, &args.nix_search_path); @@ -173,6 +173,21 @@ pub fn evaluate( } } + if let Some(dumpdir) = &args.drv_dumpdir { + // Dump all known derivations files to `dumpdir`. + std::fs::create_dir_all(dumpdir).expect("failed to create drv dumpdir"); + tvix_store_io + .known_paths + .borrow() + .get_derivations() + // Skip already dumped derivations. + .filter(|(drv_path, _)| !dumpdir.join(drv_path.to_string()).exists()) + .for_each(|(drv_path, drv)| { + std::fs::write(dumpdir.join(drv_path.to_string()), drv.to_aterm_bytes()) + .expect("failed to write drv to dumpdir"); + }) + } + Ok(EvalResult { globals, value: result.value, |