Reduce dune version to work with Nix 23.11

.gitignore

@@ -1,4 +1,3 @@
 _build/
 _coverage/
 result
-/.pre-commit-config.yaml

.pre-commit-config.yaml

@@ -0,0 +1 @@
+/nix/store/y3cj5g3rd064bxpi3r2i1k2nzhk9qrdw-pre-commit-config.json

bin/flake_env.re

@@ -12,14 +12,7 @@ let main = () => {
       switch (Lib.Watches.get()) {
       | Ok(watches) =>
         let paths = Array.map(~f=watch => watch.path, watches);
-        let hash =
+        let hash = Util.hash_files(paths);
-          switch (Util.hash_files(paths)) {
-          | Ok(hsh) => hsh
-          | Error(msg) =>
-            Printf.eprintf("%s\n", e);
-            exit(1);
-          };
-
         let profile = layout_directory ++ "/flake-profile-" ++ hash;
         let profile_rc = profile ++ ".rc";
 

direnvrc

@@ -41,7 +41,7 @@ use_flake_env() {
   local ld=$(direnv_layout_dir)
   export direnv
 
-  eval "$(@flake_env@ "${1:-"."}" "$ld")"
+  eval "$(@flake_env@ "$ld" "$@")"
 
   export -n direnv
 

flake_env.opam

@@ -10,7 +10,7 @@ doc: "https://git.sr.ht/~bryan_bennett/flake_env"
 bug-reports: "https://todo.sr.ht/~bryan_bennett/flake_env"
 depends: [
   "ocaml"
-  "dune" {>= "3.11"}
+  "dune" {>= "3.12"}
   "odoc" {with-doc}
 ]
 build: [

lib/flake_env__util.re

@@ -17,39 +17,23 @@ let nix = args =>
   );
 
 let hash_files = filenames => {
-  /*** Hash all entries in [filenames]
+  /*** Hash all entries in [filenames], returning a hex-encoded string of the hash of their contents */
-         Returns Some(hex-string) or None if no filenames are found.
-       */
   let ctx = Sha1.init();
-  let files_to_hash =
+  let () =
     filenames
     |> Array.filter(~f=f =>
          switch (Sys_unix.file_exists(f)) {
          | `Yes => true
-         | _ =>
+         | _ => false
-           // let fullpth = Filename_unix.realpath(f);
-           Printf.eprintf(
-             "Cannot find file %s (cwd: %s)\n",
-             f,
-             Core_unix.getcwd(),
-           );
-           false;
          }
-       );
+       )
-
+    |> Array.iter(~f=f => {
-  switch (files_to_hash |> Array.length) {
+         f
-  | 0 => Error("No files found to hash")
+         |> In_channel.create
-  | _ =>
+         |> In_channel.input_all
-    let () =
+         |> Sha1.update_string(ctx)
-      files_to_hash
+       });
-      |> Array.iter(~f=f => {
+  Sha1.finalize(ctx) |> Sha1.to_hex;
-           f
-           |> In_channel.create
-           |> In_channel.input_all
-           |> Sha1.update_string(ctx)
-         });
-    Ok(Sha1.finalize(ctx) |> Sha1.to_hex);
-  };
 };
 
 let rec rmrf = path => {

tests/flake_env_test_util.re

@@ -16,22 +16,7 @@ let _syst_to_bool =
 
 let check_exit_or_signal =
   Alcotest.(check(Alcotest.pair(testable_exit_or_signal, string)));
-let testable_result_string =
+let check_string = Alcotest.(check(string));
-  Alcotest.testable(
-    (pp_fmt, elem) => {
-      switch (elem) {
-      | Ok(s) => Fmt.pf(pp_fmt, "Ok(%s)", s)
-      | Error(s) => Fmt.pf(pp_fmt, "Error(%s)", s)
-      }
-    },
-    (a, b) =>
-      switch (a, b) {
-      | (Ok(a), Ok(b)) => String.compare(a, b) == 0
-      | (Error(a), Error(b)) => String.compare(a, b) == 0
-      | _ => false
-      },
-  );
-let check_result_string = Alcotest.(check(testable_result_string));
 let check_bool = Alcotest.(check(bool));
 let check_get_args =
   Alcotest.(
@@ -62,26 +47,26 @@ let test_run_process_stdout = () =>
   );
 
 let test_hash_one = () => {
-  check_result_string(
+  check_string(
     "Hash matches",
-    Ok("32b4ac64be805d730745f6bac45a5d95174ebd10"),
+    hash_files([|"../LICENSE"|]),
-    hash_files([|"spit_version.sh"|]),
+    "b43cf2e824eb66ba0e8f939c08072a8e307b5e5f",
   );
 };
 
 let test_hash_multiple = () => {
-  check_result_string(
+  check_string(
     "Hash matches",
-    Ok("e4c880fc6ab9a1b88e6be18e53fc4cec9f463d1a"),
+    hash_files([|"../LICENSE", "../LICENSE"|]),
-    hash_files([|"spit_version.sh", "spit_version.sh"|]),
+    "08304d8baeed02722f81252952b00f6ac011ce0c",
   );
 };
 
 let test_hash_filters_nonexistent = () => {
-  check_result_string(
+  check_string(
     "Hash matches",
-    Ok("32b4ac64be805d730745f6bac45a5d95174ebd10"),
+    hash_files([|"../LICENSE", "FOOBARBAZ"|]),
-    hash_files([|"spit_version.sh", "FOOBARBAZ"|]),
+    "b43cf2e824eb66ba0e8f939c08072a8e307b5e5f",
   );
 };