From c27bacd905a14207edc56850fd4ef9383706b5c4 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 31 Jan 2023 12:18:03 +0100 Subject: refactor(tvix): introduce nix-compat crate Move nixbase32 and store_path into this. This allows //tvix/cli to not pull in //tvix/store for now. Change-Id: Id3a32867205d95794bc0d33b21d4cb3d9bafd02a Reviewed-on: https://cl.tvl.fyi/c/depot/+/7964 Tested-by: BuildkiteCI Reviewed-by: tazjin --- tvix/derivation/src/derivation.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tvix/derivation/src/derivation.rs') diff --git a/tvix/derivation/src/derivation.rs b/tvix/derivation/src/derivation.rs index 390024da33ee..d58fef13bcd7 100644 --- a/tvix/derivation/src/derivation.rs +++ b/tvix/derivation/src/derivation.rs @@ -1,12 +1,12 @@ use crate::output::{Hash, Output}; use crate::write; use crate::DerivationError; +use nix_compat::nixbase32; +use nix_compat::store_path::{StorePath, STORE_DIR}; use serde::{Deserialize, Serialize}; use sha2::{Digest, Sha256}; use std::collections::BTreeSet; use std::{collections::BTreeMap, fmt, fmt::Write}; -use tvix_store::nixbase32; -use tvix_store::store_path::{StorePath, STORE_DIR}; #[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize)] pub struct Derivation { -- cgit 1.4.1