diff options
author | Florian Klink <flokli@flokli.de> | 2023-01-31T11·18+0100 |
---|---|---|
committer | flokli <flokli@flokli.de> | 2023-01-31T13·26+0000 |
commit | c27bacd905a14207edc56850fd4ef9383706b5c4 (patch) | |
tree | 197b49a52c0ab6a05196b82cbe2071b3eed5eaa0 /tvix/derivation/src/derivation.rs | |
parent | 8ea93bb646456864088a2c93e9ab2c4ccae75cba (diff) |
refactor(tvix): introduce nix-compat crate r/5788
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 <tazjin@tvl.su>
Diffstat (limited to 'tvix/derivation/src/derivation.rs')
-rw-r--r-- | tvix/derivation/src/derivation.rs | 4 |
1 files changed, 2 insertions, 2 deletions
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 { |