maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/glue/KnownPaths): track Derivation struct too

Browse source 
We need to not only store a map from drv path to hash derivation modulo,
but also keep the original Derivation struct - because we'll use that
later to trigger builds.

Change-Id: I78e2e8431ab5ae853188866b797a79025200de98
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10790
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
This commit is contained in:
Florian Klink 2024-02-10 16:04:31 +01:00 • committed by flokli
parent e7815945df
commit 58f474041e
2 changed files with 58 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tvix/glue/src/builtins/derivation.rs
View file

@ -442,7 +442,10 @@ pub(crate) mod derivation_builtins {
// Calculate the derivation_or_fod_hash for the current derivation.
// This one is still intermediate (so not added to known_paths)
let derivation_or_fod_hash_tmp = drv.derivation_or_fod_hash(|drv_path| {
known_paths.get_hash_derivation_modulo(&drv_path.to_owned())
known_paths
.get_hash_derivation_modulo(drv_path)
.unwrap_or_else(|| panic!("{} not found", drv_path))
.to_owned()
});
// Mutate the Derivation struct and set output paths
@ -453,12 +456,8 @@ pub(crate) mod derivation_builtins {
.calculate_derivation_path(name)
.map_err(DerivationError::InvalidDerivation)?;
// recompute the hash derivation modulo and add to known_paths
let derivation_or_fod_hash_final = drv.derivation_or_fod_hash(|drv_path| {
known_paths.get_hash_derivation_modulo(&drv_path.to_owned())
});
known_paths.add_hash_derivation_modulo(drv_path.clone(), &derivation_or_fod_hash_final);
// TODO: avoid cloning
known_paths.add(drv_path.clone(), drv.clone());
let mut new_attrs: Vec<(String, NixString)> = drv
.outputs