diff options
| author | Florian Klink <flokli@flokli.de> | 2023-01-04T15·29+0100 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2023-01-04T20·23+0000 |
| commit | f00e7fa92d67c8f7e07939734975dfee780a303f (patch) | |
| tree | 4a25758da0d5bd2dd7cedfe6e00061996963f38f | |
| parent | 8449f6cd0c97f341f75ac3201499ebb0c2161e6b (diff) | |
refactor(tvix/derivation): use tvix_store::nixpath::STORE_DIR r/5587
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>
| -rw-r--r-- | tvix/derivation/src/derivation.rs | 5 | ||||
| -rw-r--r-- | tvix/derivation/src/write.rs | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tvix/derivation/src/derivation.rs b/tvix/derivation/src/derivation.rs index 9531157d6f98..d6a5dc76b74a 100644 --- a/tvix/derivation/src/derivation.rs +++ b/tvix/derivation/src/derivation.rs @@ -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); diff --git a/tvix/derivation/src/write.rs b/tvix/derivation/src/write.rs index 0ad1eb71e4da..3fd8db792d10 100644 --- a/tvix/derivation/src/write.rs +++ b/tvix/derivation/src/write.rs @@ -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( |