about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tvix/Cargo.lock28
-rw-r--r--tvix/Cargo.nix116
-rw-r--r--tvix/derivation/Cargo.toml2
-rw-r--r--tvix/derivation/default.nix5
-rw-r--r--tvix/derivation/src/derivation.rs15
-rw-r--r--tvix/derivation/src/output.rs4
-rw-r--r--tvix/derivation/src/tests/mod.rs7
-rw-r--r--tvix/derivation/src/validate.rs2
8 files changed, 90 insertions, 89 deletions
diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock
index 477b6173daa2..604e16bdcee7 100644
--- a/tvix/Cargo.lock
+++ b/tvix/Cargo.lock
@@ -489,20 +489,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
 
 [[package]]
-name = "derivation"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "glob",
- "serde",
- "serde_json",
- "sha2",
- "test-case",
- "test-generator",
- "tvix-store-bin",
-]
-
-[[package]]
 name = "diff"
 version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2198,6 +2184,20 @@ dependencies = [
 ]
 
 [[package]]
+name = "tvix-derivation"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "glob",
+ "serde",
+ "serde_json",
+ "sha2",
+ "test-case",
+ "test-generator",
+ "tvix-store-bin",
+]
+
+[[package]]
 name = "tvix-eval"
 version = "0.1.0"
 dependencies = [
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index 963b5dfae5b4..977def1c7d2b 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -33,30 +33,30 @@ rec {
   # You can override the features with
   # workspaceMembers."${crateName}".build.override { features = [ "default" "feature1" ... ]; }.
   workspaceMembers = {
-    "derivation" = rec {
-      packageId = "derivation";
+    "nix-cli" = rec {
+      packageId = "nix-cli";
       build = internal.buildRustCrateWithFeatures {
-        packageId = "derivation";
+        packageId = "nix-cli";
       };
 
       # Debug support which might change between releases.
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-    "nix-cli" = rec {
-      packageId = "nix-cli";
+    "tvix-cli" = rec {
+      packageId = "tvix-cli";
       build = internal.buildRustCrateWithFeatures {
-        packageId = "nix-cli";
+        packageId = "tvix-cli";
       };
 
       # Debug support which might change between releases.
       # File a bug if you depend on any for non-debug work!
       debug = internal.debugCrate { inherit packageId; };
     };
-    "tvix-cli" = rec {
-      packageId = "tvix-cli";
+    "tvix-derivation" = rec {
+      packageId = "tvix-derivation";
       build = internal.buildRustCrateWithFeatures {
-        packageId = "tvix-cli";
+        packageId = "tvix-derivation";
       };
 
       # Debug support which might change between releases.
@@ -1489,55 +1489,6 @@ rec {
         };
         resolvedDefaultFeatures = [ "alloc" "default" "std" ];
       };
-      "derivation" = rec {
-        crateName = "derivation";
-        version = "0.1.0";
-        edition = "2021";
-        # We can't filter paths with references in Nix 2.4
-        # See https://github.com/NixOS/nix/issues/5410
-        src =
-          if (lib.versionOlder builtins.nixVersion "2.4pre20211007")
-          then lib.cleanSourceWith { filter = sourceFilter; src = ./derivation; }
-          else ./derivation;
-        dependencies = [
-          {
-            name = "anyhow";
-            packageId = "anyhow";
-          }
-          {
-            name = "glob";
-            packageId = "glob";
-          }
-          {
-            name = "serde";
-            packageId = "serde";
-            features = [ "derive" ];
-          }
-          {
-            name = "sha2";
-            packageId = "sha2";
-          }
-          {
-            name = "tvix-store";
-            packageId = "tvix-store";
-          }
-        ];
-        devDependencies = [
-          {
-            name = "serde_json";
-            packageId = "serde_json";
-          }
-          {
-            name = "test-case";
-            packageId = "test-case";
-          }
-          {
-            name = "test-generator";
-            packageId = "test-generator";
-          }
-        ];
-
-      };
       "diff" = rec {
         crateName = "diff";
         version = "0.1.13";
@@ -6538,6 +6489,55 @@ rec {
         ];
 
       };
+      "tvix-derivation" = rec {
+        crateName = "tvix-derivation";
+        version = "0.1.0";
+        edition = "2021";
+        # We can't filter paths with references in Nix 2.4
+        # See https://github.com/NixOS/nix/issues/5410
+        src =
+          if (lib.versionOlder builtins.nixVersion "2.4pre20211007")
+          then lib.cleanSourceWith { filter = sourceFilter; src = ./derivation; }
+          else ./derivation;
+        dependencies = [
+          {
+            name = "anyhow";
+            packageId = "anyhow";
+          }
+          {
+            name = "glob";
+            packageId = "glob";
+          }
+          {
+            name = "serde";
+            packageId = "serde";
+            features = [ "derive" ];
+          }
+          {
+            name = "sha2";
+            packageId = "sha2";
+          }
+          {
+            name = "tvix-store-bin";
+            packageId = "tvix-store-bin";
+          }
+        ];
+        devDependencies = [
+          {
+            name = "serde_json";
+            packageId = "serde_json";
+          }
+          {
+            name = "test-case";
+            packageId = "test-case";
+          }
+          {
+            name = "test-generator";
+            packageId = "test-generator";
+          }
+        ];
+
+      };
       "tvix-eval" = rec {
         crateName = "tvix-eval";
         version = "0.1.0";
diff --git a/tvix/derivation/Cargo.toml b/tvix/derivation/Cargo.toml
index b63b3ab9fd57..2d5ea74bdc79 100644
--- a/tvix/derivation/Cargo.toml
+++ b/tvix/derivation/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "derivation"
+name = "tvix-derivation"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/tvix/derivation/default.nix b/tvix/derivation/default.nix
new file mode 100644
index 000000000000..40e2a647609f
--- /dev/null
+++ b/tvix/derivation/default.nix
@@ -0,0 +1,5 @@
+{ depot, ... }:
+
+depot.tvix.crates.workspaceMembers.tvix-derivation.build.override {
+  runTests = true;
+}
diff --git a/tvix/derivation/src/derivation.rs b/tvix/derivation/src/derivation.rs
index bf26e1baac69..550b386a7fce 100644
--- a/tvix/derivation/src/derivation.rs
+++ b/tvix/derivation/src/derivation.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use std::{collections::BTreeMap, fmt, fmt::Write};
 use tvix_store::nixbase32::NIXBASE32;
-use tvix_store::nixpath::{ParseStorePathError, StorePath, STORE_DIR};
+use tvix_store::store_path::{ParseStorePathError, StorePath, STORE_DIR};
 
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
 pub struct Derivation {
@@ -242,7 +242,7 @@ impl Derivation {
                     hasher.update(":sha256:");
                     hasher.update(drv_replacement_str);
                     hasher.update(":");
-                    hasher.update(tvix_store::nixpath::STORE_DIR);
+                    hasher.update(STORE_DIR);
                     hasher.update(":");
 
                     // calculate the output_name_path, which is the part of the NixPath after the digest.
@@ -258,7 +258,7 @@ impl Derivation {
 
                     let abs_store_path = format!(
                         "{}/{}",
-                        tvix_store::nixpath::STORE_DIR,
+                        STORE_DIR,
                         build_store_path(false, &digest, &output_path_name)?
                     );
 
@@ -289,17 +289,14 @@ impl Derivation {
                         hasher.update(drv_replacement_str);
                     }
                     hasher.update(":");
-                    hasher.update(tvix_store::nixpath::STORE_DIR);
+                    hasher.update(STORE_DIR);
                     hasher.update(":");
                     hasher.update(name);
                     hasher.finalize()
                 };
 
-                let abs_store_path = format!(
-                    "{}/{}",
-                    tvix_store::nixpath::STORE_DIR,
-                    build_store_path(false, &digest, name)?
-                );
+                let abs_store_path =
+                    format!("{}/{}", STORE_DIR, build_store_path(false, &digest, name)?);
 
                 self.outputs.insert(
                     "out".to_string(),
diff --git a/tvix/derivation/src/output.rs b/tvix/derivation/src/output.rs
index 02ba7e42e885..1236cd989f7f 100644
--- a/tvix/derivation/src/output.rs
+++ b/tvix/derivation/src/output.rs
@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
-use tvix_store::nixpath::StorePath;
+use tvix_store::store_path::StorePath;
 
-#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize)]
 pub struct Output {
     pub path: String,
 
diff --git a/tvix/derivation/src/tests/mod.rs b/tvix/derivation/src/tests/mod.rs
index 8d1771f711f6..fb88e1beb2bf 100644
--- a/tvix/derivation/src/tests/mod.rs
+++ b/tvix/derivation/src/tests/mod.rs
@@ -6,7 +6,7 @@ use std::io::Read;
 use std::path::Path;
 use test_case::test_case;
 use test_generator::test_resources;
-use tvix_store::nixpath::StorePath;
+use tvix_store::store_path::StorePath;
 
 const RESOURCES_PATHS: &str = "src/tests/derivation_tests";
 
@@ -252,8 +252,7 @@ fn output_path_construction() {
 
     let bar_drv_path = bar_drv
         .calculate_derivation_path("bar")
-        .expect("must succeed")
-        .to_absolute_path();
+        .expect("must succeed");
 
     // assemble foo env
     let mut foo_env: BTreeMap<String, String> = BTreeMap::new();
@@ -275,7 +274,7 @@ fn output_path_construction() {
 
     // assemble foo input_derivations
     let mut foo_input_derivations: BTreeMap<String, Vec<String>> = BTreeMap::new();
-    foo_input_derivations.insert(bar_drv_path.to_absolute_string(), vec!["out".to_string()]);
+    foo_input_derivations.insert(bar_drv_path.to_absolute_path(), vec!["out".to_string()]);
 
     // assemble foo itself
     let mut foo_drv = Derivation {
diff --git a/tvix/derivation/src/validate.rs b/tvix/derivation/src/validate.rs
index 4e0503833913..eda0457ae564 100644
--- a/tvix/derivation/src/validate.rs
+++ b/tvix/derivation/src/validate.rs
@@ -1,6 +1,6 @@
 use crate::{derivation::Derivation, write::DOT_FILE_EXT};
 use anyhow::bail;
-use tvix_store::nixpath::StorePath;
+use tvix_store::store_path::StorePath;
 
 impl Derivation {
     /// validate ensures a Derivation struct is properly populated,
generated by cgit-pink 1.4.1 (git 2.44.2) at 2024-11-05T13ยท15+0000