about summary refs log tree commit diff
path: root/tvix/nix-compat/src/derivation/mod.rs
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-07-18T17·46+0300
committerclbot <clbot@tvl.fyi>2023-07-21T18·04+0000
commit5364fcb12708667a2dc698a689d00d70d1bf75af (patch)
tree54e100f28cb687202cd5e05ae95c145a3ab780b0 /tvix/nix-compat/src/derivation/mod.rs
parent728de762fd556015ad0085b4946a0915a15654e9 (diff)
feat(tvix/nix-compat): fold NameError into Error r/6432
This being a nested error makes things more complicated than necessary.

Also, this caused BuildStorePathError to only hold NameError,
so refactor these utility functions to either return Error, or
BuildStorePathError.

Change-Id: I046fb403780cc5135df8b8833a291fc2a90fd913
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8972
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tvix/nix-compat/src/derivation/mod.rs')
-rw-r--r--tvix/nix-compat/src/derivation/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/tvix/nix-compat/src/derivation/mod.rs b/tvix/nix-compat/src/derivation/mod.rs
index ab1471165549..ab615d502d99 100644
--- a/tvix/nix-compat/src/derivation/mod.rs
+++ b/tvix/nix-compat/src/derivation/mod.rs
@@ -212,7 +212,7 @@ impl Derivation {
                 build_output_path(derivation_or_fod_hash, output_name, &path_name).map_err(|e| {
                     DerivationError::InvalidOutputDerivationPath(
                         output_name.to_string(),
-                        store_path::BuildStorePathError::InvalidName(e),
+                        store_path::BuildStorePathError::InvalidStorePath(e),
                     )
                 })?
             };