about summary refs log tree commit diff
path: root/tvix/cli
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-06-08T20·00+0300
committerclbot <clbot@tvl.fyi>2023-06-12T10·15+0000
commit8d05c0ceaa9bddb7fdaab436730f093eb16374a2 (patch)
tree33e034ae01b219d413247f1f93ea383133bd8062 /tvix/cli
parent27ff98000b0cdf0ed30eb8837c7d44cd3e79d32f (diff)
refactor(tvix/src/nar): drop NARCalculationService r/6270
There's only one way to calculate NAR files, by walking through them.

Things like caching such replies should be done closer to where we use
these, composing NARCalculationService doesn't actually give us much.

Instead, expose two functions, `nar::calculate_size_and_sha256` and
`nar::writer_nar`, the latter writing NAR to a writer, the former using
write_nar to only keeping the NAR size and digest.

Change-Id: Ie5d2cfea35470fdbb5cbf9da1136b0cdf0250266
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8723
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/cli')
-rw-r--r--tvix/cli/src/main.rs13
1 files changed, 2 insertions, 11 deletions
diff --git a/tvix/cli/src/main.rs b/tvix/cli/src/main.rs
index 459177717c5a..0a1794006de2 100644
--- a/tvix/cli/src/main.rs
+++ b/tvix/cli/src/main.rs
@@ -73,20 +73,11 @@ fn interpret(code: &str, path: Option<PathBuf>, args: &Args, explain: bool) -> b
 
     let blob_service = MemoryBlobService::default();
     let directory_service = MemoryDirectoryService::default();
-    let path_info_service = MemoryPathInfoService::default();
-    let nar_calculation_service = tvix_store::nar::NonCachingNARCalculationService::new(
-        Box::new(blob_service.clone()),
-        directory_service.clone(),
-    );
+    let path_info_service = MemoryPathInfoService::default(); // TODO: update to pass in blob and directory svc
 
     eval.io_handle = Box::new(tvix_io::TvixIO::new(
         known_paths.clone(),
-        tvix_store::TvixStoreIO::new(
-            Box::new(blob_service),
-            directory_service,
-            path_info_service,
-            nar_calculation_service,
-        ),
+        tvix_store::TvixStoreIO::new(Box::new(blob_service), directory_service, path_info_service),
     ));
 
     // bundle fetchurl.nix (used in nixpkgs) by resolving <nix> to