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/Cargo.lock | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'tvix/Cargo.lock') diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index 46915411cb..7060c77314 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -1308,8 +1308,11 @@ dependencies = [ "anyhow", "data-encoding", "glob", + "serde", + "serde_json", "sha2 0.10.6", "test-case", + "test-generator", "thiserror", ] @@ -2623,30 +2626,14 @@ dependencies = [ "clap 4.0.32", "data-encoding", "dirs", + "nix-compat", "rustyline", "smol_str", "ssri", "thiserror", - "tvix-derivation", "tvix-eval", ] -[[package]] -name = "tvix-derivation" -version = "0.1.0" -dependencies = [ - "anyhow", - "data-encoding", - "glob", - "nix-compat", - "serde", - "serde_json", - "sha2 0.10.6", - "test-case", - "test-generator", - "thiserror", -] - [[package]] name = "tvix-eval" version = "0.1.0" -- cgit 1.4.1