mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/cli): always configure nix path

Browse source 
Configure the nix path even if globals is already set.

Change-Id: I6598c92ab40ff952f73da04d9e7d3aeb13c16b53
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12176
Tested-by: BuildkiteCI
Autosubmit: aspen <root@gws.fyi>
Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com>
This commit is contained in:
Aspen Smith 2024-08-10 15:13:29 -04:00 committed by clbot
parent 7c2ac040db
commit f5c6acbbeb
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tvix/cli/src/lib.rs
View file

@ -113,9 +113,9 @@ pub fn evaluate(
eval_builder = add_derivation_builtins(eval_builder, Rc::clone(&tvix_store_io)); 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_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, tvix_store_io);
eval_builder = configure_nix_path(eval_builder, &args.nix_search_path);
} }
}; };
eval_builder = configure_nix_path(eval_builder, &args.nix_search_path);
if let Some(source_map) = source_map { if let Some(source_map) = source_map {
eval_builder = eval_builder.with_source_map(source_map); eval_builder = eval_builder.with_source_map(source_map);

15
tvix/cli/tests/repl.rs
View file

@ -9,7 +9,11 @@ macro_rules! test_repl {
#[test] #[test]
fn $name() { fn $name() {
let tokio_runtime = tokio::runtime::Runtime::new().unwrap(); let tokio_runtime = tokio::runtime::Runtime::new().unwrap();
let args = tvix_cli::Args::parse_from(Vec::<OsString>::new()); let args = tvix_cli::Args::parse_from(vec![
OsString::from("tvix"),
OsString::from("--nix-search-path"),
OsString::from("nixpkgs=/tmp"),
]);
let mut repl = tvix_cli::Repl::new(init_io_handle(&tokio_runtime, &args), &args); let mut repl = tvix_cli::Repl::new(init_io_handle(&tokio_runtime, &args), &args);
$({ $({
let result = repl.send($send.into()); let result = repl.send($send.into());
@ -83,3 +87,12 @@ test_repl!(explain() {
=> a 2-item attribute set => a 2-item attribute set
"#]]; "#]];
}); });
test_repl!(reference_nix_path() {
"<nixpkgs>" => expect![[r#"
=> /tmp :: path
"#]];
"<nixpkgs>" => expect![[r#"
=> /tmp :: path
"#]];
});