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

fix(tvix/derivation): fix build after StorePath rename

Browse source 
This project was not previously covered by CI (fixed in this commit),
so we didn't catch breakage due to a renamed module.

This was noticed while rebasing a CL that has a dependency on this
crate in its Nix build.

Change-Id: Ic48570b9313e5f73e14daab50cf7ea70918c94d1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7778
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2023-01-06 18:56:38 +03:00 • committed by tazjin
parent 3e03e59893
commit 1ebda9e13e
8 changed files with 91 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tvix/derivation/src/derivation.rs
View file

@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
use sha2::{Digest, Sha256};
use std::{collections::BTreeMap, fmt, fmt::Write};
use tvix_store::nixbase32::NIXBASE32;
use tvix_store::nixpath::{ParseStorePathError, StorePath, STORE_DIR};
use tvix_store::store_path::{ParseStorePathError, StorePath, STORE_DIR};
#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
pub struct Derivation {
@ -242,7 +242,7 @@ impl Derivation {
hasher.update(":sha256:");
hasher.update(drv_replacement_str);
hasher.update(":");
hasher.update(tvix_store::nixpath::STORE_DIR);
hasher.update(STORE_DIR);
hasher.update(":");
// calculate the output_name_path, which is the part of the NixPath after the digest.
@ -258,7 +258,7 @@ impl Derivation {
let abs_store_path = format!(
"{}/{}",
tvix_store::nixpath::STORE_DIR,
STORE_DIR,
build_store_path(false, &digest, &output_path_name)?
);
@ -289,17 +289,14 @@ impl Derivation {
hasher.update(drv_replacement_str);
}
hasher.update(":");
hasher.update(tvix_store::nixpath::STORE_DIR);
hasher.update(STORE_DIR);
hasher.update(":");
hasher.update(name);
hasher.finalize()
};
let abs_store_path = format!(
"{}/{}",
tvix_store::nixpath::STORE_DIR,
build_store_path(false, &digest, name)?
);
let abs_store_path =
format!("{}/{}", STORE_DIR, build_store_path(false, &digest, name)?);
self.outputs.insert(
"out".to_string(),

4
tvix/derivation/src/output.rs
View file

@ -1,7 +1,7 @@
use serde::{Deserialize, Serialize};
use tvix_store::nixpath::StorePath;
use tvix_store::store_path::StorePath;
#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
#[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize)]
pub struct Output {
pub path: String,

7
tvix/derivation/src/tests/mod.rs
View file

@ -6,7 +6,7 @@ use std::io::Read;
use std::path::Path;
use test_case::test_case;
use test_generator::test_resources;
use tvix_store::nixpath::StorePath;
use tvix_store::store_path::StorePath;
const RESOURCES_PATHS: &str = "src/tests/derivation_tests";
@ -252,8 +252,7 @@ fn output_path_construction() {
let bar_drv_path = bar_drv
.calculate_derivation_path("bar")
.expect("must succeed")
.to_absolute_path();
.expect("must succeed");
// assemble foo env
let mut foo_env: BTreeMap<String, String> = BTreeMap::new();
@ -275,7 +274,7 @@ fn output_path_construction() {
// assemble foo input_derivations
let mut foo_input_derivations: BTreeMap<String, Vec<String>> = BTreeMap::new();
foo_input_derivations.insert(bar_drv_path.to_absolute_string(), vec!["out".to_string()]);
foo_input_derivations.insert(bar_drv_path.to_absolute_path(), vec!["out".to_string()]);
// assemble foo itself
let mut foo_drv = Derivation {

2
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::StorePath;
use tvix_store::store_path::StorePath;
impl Derivation {
/// validate ensures a Derivation struct is properly populated,