diff options
author | Florian Klink <flokli@flokli.de> | 2023-01-31T14·08+0100 |
---|---|---|
committer | flokli <flokli@flokli.de> | 2023-01-31T15·18+0000 |
commit | a23b7e17c04453a4d5ea2d47a88c6c6874471c08 (patch) | |
tree | 6dfa0bd2273519b5cfd5d03ec0f661dad4739a26 /tvix/nix-compat/src | |
parent | 1e28cc7edee0763f1f907af34033acb3a278b546 (diff) |
refactor(tvix/nix-compat): absorb nar writer r/5793
Expose it at `nix_compat::nar::writer`. Change-Id: I98a8acfa6277074f24608d64fb6c0082b41d10f5 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7969 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI
Diffstat (limited to '')
-rw-r--r-- | tvix/nix-compat/src/lib.rs | 1 | ||||
-rw-r--r-- | tvix/nix-compat/src/nar/mod.rs | 1 | ||||
-rw-r--r-- | tvix/nix-compat/src/nar/writer/mod.rs (renamed from tvix/nar/src/lib.rs) | 2 | ||||
-rw-r--r-- | tvix/nix-compat/src/nar/writer/wire.rs (renamed from tvix/nar/src/wire.rs) | 0 |
4 files changed, 3 insertions, 1 deletions
diff --git a/tvix/nix-compat/src/lib.rs b/tvix/nix-compat/src/lib.rs index 59d687ee7fe2..60775ad90e05 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 000000000000..d3baa817825a --- /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 index 62d2be50140e..9f9640e273bb 100644 --- a/tvix/nar/src/lib.rs +++ b/tvix/nix-compat/src/nar/writer/mod.rs @@ -16,7 +16,7 @@ //! let mut sink: Vec<u8> = 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 index 98581ae3aa7c..98581ae3aa7c 100644 --- a/tvix/nar/src/wire.rs +++ b/tvix/nix-compat/src/nar/writer/wire.rs |