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

fix(snix/glue): fix Store Path parsing

Browse source 
All outputs constructed by derivation_to_build_request use inputs_dir as
a prefix (so we cannot use StorePath::from_bytes, which only takes
the basename), and they are relative to their root, so we cannot use
StorePath::from_absolute_path either.

Construct the store paths by stripping inputs_dir early (right after
the call to derivation_to_build_request), and use them later.

Change-Id: I3874e11cf21159c05b02314d9baf26cc98ea7956
Reviewed-on: https://cl.snix.dev/c/snix/+/30569
Reviewed-by: Yureka <snix@yuka.dev>
Tested-by: besadii
Autosubmit: Florian Klink <flokli@flokli.de>
This commit is contained in:
Florian Klink 2025-06-11 14:40:54 +03:00 • committed by clbot
parent d741ca4bb1
commit 859faa8eb1
1 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
snix/glue/src/snix_store_io.rs
View file

@ -197,7 +197,25 @@ impl SnixStoreIO {
// synthesize the build request. // synthesize the build request.
let build_request = derivation_to_build_request(&drv, &resolved_inputs)?; let build_request = derivation_to_build_request(&drv, &resolved_inputs)?;
let build_request_outputs = build_request.outputs.clone(); // collect all store paths from the request, sorted.
let output_paths: Vec<StorePath<String>> = build_request
.outputs
.iter()
.map(|output_path| {
// in the case of building nix store paths,
// all outputs are in `inputs_dir`.
// When stripping it, we end up with the store path
// basename.
StorePath::from_bytes(
output_path
.strip_prefix(&build_request.inputs_dir)
.expect("Snix bug: inputs_dir not prefix of request output")
.as_os_str()
.as_encoded_bytes(),
)
.expect("Snix bug: unable to parse output path as StorePath")
})
.collect();
// create a build // create a build
let build_result = self let build_result = self
@ -211,18 +229,8 @@ impl SnixStoreIO {
// For each output, insert a PathInfo. // For each output, insert a PathInfo.
for (output, output_path) in for (output, output_path) in
build_result.outputs.into_iter().zip(build_request_outputs) build_result.outputs.into_iter().zip(output_paths)
{ {
// convert output_path to StorePath
let output_store_path: StorePath<String> = {
use std::os::unix::ffi::OsStrExt;
StorePath::from_bytes(output_path.as_path().as_os_str().as_bytes())
.map_err(|e| {
std::io::Error::new(std::io::ErrorKind::InvalidData, e)
})?
};
// calculate the nar representation // calculate the nar representation
let (nar_size, nar_sha256) = self let (nar_size, nar_sha256) = self
.nar_calculation_service .nar_calculation_service
@ -231,7 +239,7 @@ impl SnixStoreIO {
// assemble the PathInfo to persist // assemble the PathInfo to persist
let path_info = PathInfo { let path_info = PathInfo {
store_path: output_store_path.clone(), store_path: output_path.clone(),
node: output.node, node: output.node,
references: { references: {
let all_possible_refs: Vec<_> = drv let all_possible_refs: Vec<_> = drv
@ -283,7 +291,7 @@ impl SnixStoreIO {
.await .await
.map_err(|e| std::io::Error::new(io::ErrorKind::Other, e))?; .map_err(|e| std::io::Error::new(io::ErrorKind::Other, e))?;
if store_path == &output_store_path { if store_path == &output_path {
out_path_info = Some(path_info); out_path_info = Some(path_info);
} }
} }