diff options
Diffstat (limited to 'tvix/cli')
-rw-r--r-- | tvix/cli/Cargo.toml | 2 | ||||
-rw-r--r-- | tvix/cli/src/derivation.rs | 9 | ||||
-rw-r--r-- | tvix/cli/src/errors.rs | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/tvix/cli/Cargo.toml b/tvix/cli/Cargo.toml index 5bb7baa15864..69b54bd299ec 100644 --- a/tvix/cli/Cargo.toml +++ b/tvix/cli/Cargo.toml @@ -8,8 +8,8 @@ name = "tvix" path = "src/main.rs" [dependencies] +nix-compat = { path = "../nix-compat" } tvix-eval = { path = "../eval" } -tvix-derivation = { path = "../derivation" } rustyline = "10.0.0" clap = { version = "4.0", features = ["derive", "env"] } dirs = "4.0.0" diff --git a/tvix/cli/src/derivation.rs b/tvix/cli/src/derivation.rs index 2b12f6dd732a..5014076ace97 100644 --- a/tvix/cli/src/derivation.rs +++ b/tvix/cli/src/derivation.rs @@ -1,10 +1,10 @@ //! Implements `builtins.derivation`, the core of what makes Nix build packages. use data_encoding::BASE64; +use nix_compat::derivation::{Derivation, Hash}; use std::cell::RefCell; use std::collections::{btree_map, BTreeSet}; use std::rc::Rc; -use tvix_derivation::{Derivation, Hash}; use tvix_eval::builtin_macros::builtins; use tvix_eval::{AddContext, CoercionKind, ErrorKind, NixAttrs, NixList, Value, VM}; @@ -416,9 +416,10 @@ mod derivation_builtins { // TODO: fail on derivation references (only "plain" is allowed here) - let path = tvix_derivation::path_with_references(name.as_str(), content.as_str(), refs) - .map_err(Error::InvalidDerivation)? - .to_absolute_path(); + let path = + nix_compat::derivation::path_with_references(name.as_str(), content.as_str(), refs) + .map_err(Error::InvalidDerivation)? + .to_absolute_path(); state.borrow_mut().plain(&path); diff --git a/tvix/cli/src/errors.rs b/tvix/cli/src/errors.rs index cc402c9a9d45..5315b2486420 100644 --- a/tvix/cli/src/errors.rs +++ b/tvix/cli/src/errors.rs @@ -1,6 +1,6 @@ +use nix_compat::derivation::DerivationError; use std::rc::Rc; use thiserror::Error; -use tvix_derivation::DerivationError; /// Errors related to derivation construction #[derive(Debug, Error, PartialEq)] |