diff options
Diffstat (limited to 'tvix/glue/src/builtins')
| -rw-r--r-- | tvix/glue/src/builtins/derivation.rs | 8 | ||||
| -rw-r--r-- | tvix/glue/src/builtins/import.rs | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/tvix/glue/src/builtins/derivation.rs b/tvix/glue/src/builtins/derivation.rs index a79545437a67..6a61b0dbaf36 100644 --- a/tvix/glue/src/builtins/derivation.rs +++ b/tvix/glue/src/builtins/derivation.rs @@ -179,7 +179,7 @@ pub(crate) mod derivation_builtins { use nix_compat::nixhash::CAHash; use nix_compat::store_path::{build_ca_path, hash_placeholder}; use sha2::Sha256; - use tvix_castore::{FileNode, Node}; + use tvix_castore::Node; use tvix_eval::generators::Gen; use tvix_eval::{NixContext, NixContextElement, NixString}; use tvix_store::proto::{NarInfo, PathInfo}; @@ -577,7 +577,11 @@ pub(crate) mod derivation_builtins { }) .map_err(DerivationError::InvalidDerivation)?; - let root_node = Node::File(FileNode::new(blob_digest, blob_size, false)); + let root_node = Node::File { + digest: blob_digest, + size: blob_size, + executable: false, + }; // calculate the nar hash let (nar_size, nar_sha256) = state diff --git a/tvix/glue/src/builtins/import.rs b/tvix/glue/src/builtins/import.rs index a09dc5a06b35..3660f575c843 100644 --- a/tvix/glue/src/builtins/import.rs +++ b/tvix/glue/src/builtins/import.rs @@ -3,7 +3,7 @@ use crate::builtins::errors::ImportError; use std::path::Path; use tvix_castore::import::ingest_entries; -use tvix_castore::{FileNode, Node}; +use tvix_castore::Node; use tvix_eval::{ builtin_macros::builtins, generators::{self, GenCo}, @@ -213,7 +213,11 @@ mod import_builtins { .tokio_handle .block_on(async { blob_writer.close().await })?; - let root_node = Node::File(FileNode::new(blob_digest, blob_size, false)); + let root_node = Node::File { + digest: blob_digest, + size: blob_size, + executable: false, + }; let ca_hash = if recursive_ingestion { let (_nar_size, nar_sha256) = state |