From 2d24c5f260945216ca01371d4120f5d53f08b2cd Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 31 Jan 2023 14:45:42 +0100 Subject: refactor(tvix/nix-compat): absorb //tvix/derivation Put this in its src/derivation. Change-Id: Ic047ab1c2da555a833ee454e10ef60c77537b617 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7967 Reviewed-by: tazjin Tested-by: BuildkiteCI Autosubmit: flokli --- tvix/cli/src/derivation.rs | 9 +++++---- tvix/cli/src/errors.rs | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'tvix/cli/src') 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)] -- cgit 1.4.1