diff options
| author | Florian Klink <flokli@flokli.de> | 2023-01-17T10·56+0100 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2023-01-18T17·13+0000 |
| commit | 0aad4e2246971601c16a20240eebf61964f8c198 (patch) | |
| tree | a49816722bc23aee64df70fabe9739a1d145ffdf /tvix/derivation/src/output.rs | |
| parent | c8918334142be3cf79e3555467a00545ea5fea07 (diff) | |
feat(tvix/derivation): also fail if output name is called `drv` r/5694
`drv` is an invalid output name too, as this would cause a `builtins.derivation` call to return an attrset with a `drvPath` key (which already exists) and has a different meaning. Also handle errors during store path construction, and return our own error type, instead of the ParseStorePathError. Change-Id: Ib7952dde1d5cf18a0e210928df7c57b5939b7678 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7850 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix/derivation/src/output.rs')
| -rw-r--r-- | tvix/derivation/src/output.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tvix/derivation/src/output.rs b/tvix/derivation/src/output.rs index cd77c00f2f41..b8bd49fbbb18 100644 --- a/tvix/derivation/src/output.rs +++ b/tvix/derivation/src/output.rs @@ -1,8 +1,6 @@ use serde::{Deserialize, Serialize}; use tvix_store::store_path::{ParseStorePathError, StorePath}; -use crate::ValidateDerivationError; - #[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize)] pub struct Output { pub path: String, |