mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/derivation): use tvix_store::nixpath::STORE_DIR

Browse source 
There's now a common constant for this, so we don't need to redefine
it here.

Change-Id: I48b096f5e623e5fc5bbd355db83b674766935f94
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7753
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Florian Klink 2023-01-04 16:29:06 +01:00 committed by flokli
parent 8449f6cd0c
commit f00e7fa92d
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,7 @@ use serde::{Deserialize, Serialize};
use sha2::{Digest, Sha256};
use std::{collections::BTreeMap, fmt, fmt::Write, iter::FromIterator};
use tvix_store::nixbase32::NIXBASE32;
use tvix_store::nixpath::STORE_DIR;
#[derive(Serialize, Deserialize)]
pub struct Derivation {
@ -84,7 +85,9 @@ impl Derivation {
hasher.update(format!("{:x}", digest));
hasher.update(write::COLON);
hasher.update(write::STORE_PATH_COLON);
hasher.update(STORE_DIR);
hasher.update(write::COLON);
hasher.update(name);
hasher.update(write::DOT_FILE_EXT);

1
tvix/derivation/src/write.rs
View file

@ -13,7 +13,6 @@ pub const QUOTE: char = '"';
pub const COLON: &str = ":";
pub const TEXT_COLON: &str = "text:";
pub const SHA256_COLON: &str = "sha256:";
pub const STORE_PATH_COLON: &str = "/nix/store:";
pub const DOT_FILE_EXT: &str = ".drv";
fn write_array_elements(