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

refactor(tvix/store): rename NixPath to StorePath

Browse source 
As discussed in #tvl, this is a more common term for it.

Change-Id: I9b904222b8c076f82192c9b7f0b42be171614ab7
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7776
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2023-01-06 16:27:27 +01:00 • committed by flokli
parent 999afd4be2
commit c89af03a03
9 changed files with 68 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
use crate::{derivation::Derivation, write::DOT_FILE_EXT};
use anyhow::bail;
use tvix_store::nixpath::NixPath;
use tvix_store::nixpath::StorePath;
impl Derivation {
/// validate ensures a Derivation struct is properly populated,
@ -35,7 +35,7 @@ impl Derivation {
// Validate all input_derivations
for (input_derivation_path, output_names) in &self.input_derivations {
// Validate input_derivation_path
NixPath::from_absolute_path(input_derivation_path)?;
StorePath::from_absolute_path(input_derivation_path)?;
if !input_derivation_path.ends_with(DOT_FILE_EXT) {
bail!(
"derivation {} does not end with .drv",
@ -70,7 +70,7 @@ impl Derivation {
// Validate all input_sources
for (i, input_source) in self.input_sources.iter().enumerate() {
NixPath::from_absolute_path(input_source)?;
StorePath::from_absolute_path(input_source)?;
if i > 0 && self.input_sources[i - 1] >= *input_source {
bail!(