5 files changed, 41 insertions, 24 deletions
diff --git a/tvix/eval/src/builtins/hash.rs b/tvix/eval/src/builtins/hash.rs
new file mode 100644
index 000000000000..6d07fc9b2dc8
--- /dev/null
+++ b/tvix/eval/src/builtins/hash.rs
@@ -0,0 +1,25 @@
+use bstr::ByteSlice;
+use data_encoding::HEXLOWER;
+use md5::Md5;
+use sha1::Sha1;
+use sha2::{digest::Output, Digest, Sha256, Sha512};
+
+use crate::ErrorKind;
+
+fn hash<D: Digest>(b: &[u8]) -> Output<D> {
+    let mut hasher = D::new();
+    hasher.update(b);
+    hasher.finalize()
+}
+
+pub fn hash_nix_string(algo: impl AsRef<[u8]>, s: impl AsRef<[u8]>) -> Result<String, ErrorKind> {
+    match algo.as_ref() {
+        b"md5" => Ok(HEXLOWER.encode(hash::<Md5>(s.as_ref()).as_bstr())),
+        b"sha1" => Ok(HEXLOWER.encode(hash::<Sha1>(s.as_ref()).as_bstr())),
+        b"sha256" => Ok(HEXLOWER.encode(hash::<Sha256>(s.as_ref()).as_bstr())),
+        b"sha512" => Ok(HEXLOWER.encode(hash::<Sha512>(s.as_ref()).as_bstr())),
+        _ => Err(ErrorKind::UnknownHashType(
+            algo.as_ref().as_bstr().to_string(),
+        )),
+    }
+}
diff --git a/tvix/eval/src/builtins/impure.rs b/tvix/eval/src/builtins/impure.rs
index def6ce29094c..aad55c7331e8 100644
--- a/tvix/eval/src/builtins/impure.rs
+++ b/tvix/eval/src/builtins/impure.rs
@@ -21,7 +21,7 @@ mod impure_builtins {
     use std::os::unix::ffi::OsStrExt;
 
     use super::*;
-    use crate::builtins::coerce_value_to_path;
+    use crate::builtins::{coerce_value_to_path, hash::hash_nix_string};
 
     #[builtin("getEnv")]
     async fn builtin_get_env(co: GenCo, var: Value) -> Result<Value, ErrorKind> {
@@ -30,6 +30,17 @@ mod impure_builtins {
             .into())
     }
 
+    #[builtin("hashFile")]
+    #[allow(non_snake_case)]
+    async fn builtin_hashFile(co: GenCo, algo: Value, path: Value) -> Result<Value, ErrorKind> {
+        let path = match coerce_value_to_path(&co, path).await? {
+            Err(cek) => return Ok(Value::from(cek)),
+            Ok(p) => p,
+        };
+        let s = generators::request_read_to_string(&co, path).await;
+        hash_nix_string(algo.to_str()?, s.to_str()?).map(Value::from)
+    }
+
     #[builtin("pathExists")]
     async fn builtin_path_exists(co: GenCo, path: Value) -> Result<Value, ErrorKind> {
         match coerce_value_to_path(&co, path).await? {
diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs
index 119c0bda2dc3..0e0890f7cd28 100644
--- a/tvix/eval/src/builtins/mod.rs
+++ b/tvix/eval/src/builtins/mod.rs
@@ -5,14 +5,9 @@
 
 use bstr::{ByteSlice, ByteVec};
 use builtin_macros::builtins;
-use data_encoding::HEXLOWER;
 use genawaiter::rc::Gen;
 use imbl::OrdMap;
-use md5::Md5;
 use regex::Regex;
-use sha1::Sha1;
-use sha2::digest::Output;
-use sha2::{Digest, Sha256, Sha512};
 use std::cmp::{self, Ordering};
 use std::collections::VecDeque;
 use std::collections::{BTreeMap, HashSet};
@@ -24,12 +19,14 @@ use crate::vm::generators::{self, GenCo};
 use crate::warnings::WarningKind;
 use crate::{
     self as tvix_eval,
+    builtins::hash::hash_nix_string,
     errors::{CatchableErrorKind, ErrorKind},
     value::{CoercionKind, NixAttrs, NixList, NixString, Thunk, Value},
 };
 
 use self::versions::{VersionPart, VersionPartsIter};
 
+mod hash;
 mod to_xml;
 mod versions;
 
@@ -692,23 +689,7 @@ mod pure_builtins {
     #[builtin("hashString")]
     #[allow(non_snake_case)]
     async fn builtin_hashString(co: GenCo, algo: Value, s: Value) -> Result<Value, ErrorKind> {
-        fn hash<D: Digest>(b: &[u8]) -> Output<D> {
-            let mut hasher = D::new();
-            hasher.update(b);
-            hasher.finalize()
-        }
-
-        let s = s.to_str()?;
-
-        let encoded_hash = match algo.to_str()?.as_bytes() {
-            b"md5" => HEXLOWER.encode(hash::<Md5>(&s).as_bstr()),
-            b"sha1" => HEXLOWER.encode(hash::<Sha1>(&s).as_bstr()),
-            b"sha256" => HEXLOWER.encode(hash::<Sha256>(&s).as_bstr()),
-            b"sha512" => HEXLOWER.encode(hash::<Sha512>(&s).as_bstr()),
-            _ => return Err(ErrorKind::UnknownHashType(s.into())),
-        };
-
-        Ok(Value::from(encoded_hash))
+        hash_nix_string(algo.to_str()?, s.to_str()?).map(Value::from)
     }
 
     #[builtin("head")]
diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-hashfile.exp b/tvix/eval/src/tests/nix_tests/eval-okay-hashfile.exp
index ff1e8293ef22..ff1e8293ef22 100644
--- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-hashfile.exp
+++ b/tvix/eval/src/tests/nix_tests/eval-okay-hashfile.exp
diff --git a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-hashfile.nix b/tvix/eval/src/tests/nix_tests/eval-okay-hashfile.nix
index 8c9de66b7ecf..aff5a1856814 100644
--- a/tvix/eval/src/tests/nix_tests/notyetpassing/eval-okay-hashfile.nix
+++ b/tvix/eval/src/tests/nix_tests/eval-okay-hashfile.nix
@@ -1,4 +1,4 @@
 let
-  paths = [ ./../data ./../binary-data ];
+  paths = [ ./data ./binary-data ];
 in
   builtins.concatLists (map (hash: map (builtins.hashFile hash) paths) ["md5" "sha1" "sha256" "sha512"])