mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/eval): emit only warnings on shadowed outputs

Browse source 
Unfortunately, nixpkgs has at least one case[1] where the out environment
variable is shadowed -- though it doesn't cause a problem, since it's
shadowed with the correct value, odd as this may be!

[1]: c7c2984716/pkgs/development/python-modules/pybind11/default.nix (L19)

Change-Id: Ibf6790d2484dc9cce8e424feeb5886664d498dc3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8696
Autosubmit: tazjin <tazjin@tvl.su>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
Linus Heckemann 2023-06-01 21:21:23 +02:00 • committed by clbot
parent 7604833d2a
commit 2b4ad47c16
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tvix/cli/src/derivation.rs
View file

@ -5,8 +5,8 @@ use std::cell::RefCell;
use std::collections::{btree_map, BTreeSet};
use std::rc::Rc;
use tvix_eval::builtin_macros::builtins;
use tvix_eval::generators::{self, GenCo};
use tvix_eval::{AddContext, CoercionKind, ErrorKind, NixAttrs, NixList, Value};
use tvix_eval::generators::{self, emit_warning_kind, GenCo};
use tvix_eval::{AddContext, CoercionKind, ErrorKind, NixAttrs, NixList, Value, WarningKind};
use crate::errors::Error;
use crate::known_paths::{KnownPaths, PathKind, PathName};
@ -327,7 +327,7 @@ mod derivation_builtins {
.insert(output.to_string(), String::new())
.is_some()
{
return Err(Error::ShadowedOutput(output.to_string()).into());
emit_warning_kind(&co, WarningKind::ShadowedOutput(output.to_string())).await;
}
}

2
tvix/cli/src/errors.rs
View file

@ -11,8 +11,6 @@ pub enum Error {
ConflictingOutputTypes,
#[error("the environment variable '{0}' has already been set in this derivation")]
DuplicateEnvVar(String),
#[error("the environment variable '{0}' shadows the name of an output")]
ShadowedOutput(String),
#[error("invalid derivation parameters: {0}")]
InvalidDerivation(DerivationError),
#[error("invalid output hash: {0}")]