From 1ebda9e13e0a11d3040267134e0a23600f9faf65 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 6 Jan 2023 18:56:38 +0300 Subject: fix(tvix/derivation): fix build after StorePath rename 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 Autosubmit: tazjin Tested-by: BuildkiteCI --- tvix/derivation/src/derivation.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'tvix/derivation/src/derivation.rs') diff --git a/tvix/derivation/src/derivation.rs b/tvix/derivation/src/derivation.rs index bf26e1baac69..550b386a7fce 100644 --- a/tvix/derivation/src/derivation.rs +++ b/tvix/derivation/src/derivation.rs @@ -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(), -- cgit 1.4.1