diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index 7060c7731..bc0bafc00 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -2675,10 +2675,6 @@ dependencies = [ "tvix-eval", ] -[[package]] -name = "tvix-nar" -version = "0.0.0" - [[package]] name = "tvix-serde" version = "0.1.0" diff --git a/tvix/Cargo.toml b/tvix/Cargo.toml index 079d36218..314e329e6 100644 --- a/tvix/Cargo.toml +++ b/tvix/Cargo.toml @@ -21,7 +21,6 @@ members = [ "cli", "eval", "eval/builtin-macros", - "nar", "nix_cli", "nix-compat", "serde", diff --git a/tvix/nar/Cargo.toml b/tvix/nar/Cargo.toml deleted file mode 100644 index 6ec8072c3..000000000 --- a/tvix/nar/Cargo.toml +++ /dev/null @@ -1,4 +0,0 @@ -[package] -name = "tvix-nar" -version = "0.0.0" -edition = "2021" diff --git a/tvix/nar/default.nix b/tvix/nar/default.nix deleted file mode 100644 index 4d62add05..000000000 --- a/tvix/nar/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ depot, ... }: - -depot.tvix.crates.workspaceMembers.tvix-nar.build.override { - runTests = true; -} diff --git a/tvix/nix-compat/src/lib.rs b/tvix/nix-compat/src/lib.rs index 59d687ee7..60775ad90 100644 --- a/tvix/nix-compat/src/lib.rs +++ b/tvix/nix-compat/src/lib.rs @@ -1,3 +1,4 @@ pub mod derivation; +pub mod nar; pub mod nixbase32; pub mod store_path; diff --git a/tvix/nix-compat/src/nar/mod.rs b/tvix/nix-compat/src/nar/mod.rs new file mode 100644 index 000000000..d3baa8178 --- /dev/null +++ b/tvix/nix-compat/src/nar/mod.rs @@ -0,0 +1 @@ +pub mod writer; diff --git a/tvix/nar/src/lib.rs b/tvix/nix-compat/src/nar/writer/mod.rs similarity index 98% rename from tvix/nar/src/lib.rs rename to tvix/nix-compat/src/nar/writer/mod.rs index 62d2be501..9f9640e27 100644 --- a/tvix/nar/src/lib.rs +++ b/tvix/nix-compat/src/nar/writer/mod.rs @@ -16,7 +16,7 @@ //! let mut sink: Vec = Vec::new(); //! //! // Instantiate writer for this output location. -//! let mut nar = tvix_nar::open(&mut sink)?; +//! let mut nar = nix_compat::nar::writer::open(&mut sink)?; //! //! // Acquire metadata for the single file to output, and pass it in a //! // `BufRead`-implementing type. diff --git a/tvix/nar/src/wire.rs b/tvix/nix-compat/src/nar/writer/wire.rs similarity index 100% rename from tvix/nar/src/wire.rs rename to tvix/nix-compat/src/nar/writer/wire.rs