feat(tvix/nix-compat): Use StorePath in Output
https: //b.tvl.fyi/issues/264 Change-Id: Icb09be9643245cc68d09f01d7723af2d44d6bd1a Reviewed-on: https://cl.tvl.fyi/c/depot/+/11001 Autosubmit: Peter Kolloch <info@eigenvalue.net> Reviewed-by: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
This commit is contained in:
parent
035f617b7f
commit
fde488ec6d
11 changed files with 119 additions and 82 deletions
|
|
@ -116,7 +116,7 @@ fn handle_fixed_output(
|
|||
drv.outputs.insert(
|
||||
"out".to_string(),
|
||||
Output {
|
||||
path: "".to_string(),
|
||||
path: None,
|
||||
ca_hash: match hash_mode_str.as_deref() {
|
||||
None | Some("flat") => Some(nixhash::CAHash::Flat(nixhash)),
|
||||
Some("recursive") => Some(nixhash::CAHash::Nar(nixhash)),
|
||||
|
|
@ -486,7 +486,7 @@ pub(crate) mod derivation_builtins {
|
|||
(
|
||||
name.clone(),
|
||||
(
|
||||
output.path,
|
||||
output.path.unwrap().to_absolute_path(),
|
||||
Some(
|
||||
NixContextElement::Single {
|
||||
name,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue