3 files changed, 10 insertions, 6 deletions
diff --git a/tvix/cli/Cargo.toml b/tvix/cli/Cargo.toml
index cb795976a971..577ee8bb9e87 100644
--- a/tvix/cli/Cargo.toml
+++ b/tvix/cli/Cargo.toml
@@ -9,6 +9,7 @@ path = "src/main.rs"
 
 [dependencies]
 nix-compat = { path = "../nix-compat" }
+tvix-castore = { path = "../castore" }
 tvix-store = { path = "../store", features = []}
 tvix-eval = { path = "../eval" }
 bytes = "1.4.0"
diff --git a/tvix/cli/src/main.rs b/tvix/cli/src/main.rs
index 65970e1d1cd8..ebcfe4b800b8 100644
--- a/tvix/cli/src/main.rs
+++ b/tvix/cli/src/main.rs
@@ -13,10 +13,10 @@ use std::{fs, path::PathBuf};
 use clap::Parser;
 use known_paths::KnownPaths;
 use rustyline::{error::ReadlineError, Editor};
+use tvix_castore::blobservice::MemoryBlobService;
+use tvix_castore::directoryservice::MemoryDirectoryService;
 use tvix_eval::observer::{DisassemblingObserver, TracingObserver};
 use tvix_eval::Value;
-use tvix_store::blobservice::MemoryBlobService;
-use tvix_store::directoryservice::MemoryDirectoryService;
 use tvix_store::pathinfoservice::MemoryPathInfoService;
 use tvix_store_io::TvixStoreIO;
 
diff --git a/tvix/cli/src/tvix_store_io.rs b/tvix/cli/src/tvix_store_io.rs
index ef112858b1bc..cc69357282fd 100644
--- a/tvix/cli/src/tvix_store_io.rs
+++ b/tvix/cli/src/tvix_store_io.rs
@@ -6,14 +6,17 @@ use tokio::io::AsyncReadExt;
 use tracing::{error, instrument, warn};
 use tvix_eval::{EvalIO, FileType, StdIO};
 
-use tvix_store::{
+use tvix_castore::{
     blobservice::BlobService,
     directoryservice::{self, DirectoryService},
     import,
+    proto::{node::Node, NamedNode},
+    B3Digest,
+};
+use tvix_store::{
     nar::calculate_size_and_sha256,
     pathinfoservice::PathInfoService,
-    proto::{node::Node, NamedNode, NarInfo, PathInfo},
-    B3Digest,
+    proto::{NarInfo, PathInfo},
 };
 
 /// Implements [EvalIO], asking given [PathInfoService], [DirectoryService]
@@ -330,7 +333,7 @@ async fn import_path_with_pathinfo(
 
     // assemble the [PathInfo] object.
     let path_info = PathInfo {
-        node: Some(tvix_store::proto::Node {
+        node: Some(tvix_castore::proto::Node {
             node: Some(root_node),
         }),
         // There's no reference scanning on path contents ingested like this.