summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorยท๐‘‘๐‘ด๐‘•๐‘‘๐‘ฉ๐‘ค2025-12-11 17:25:38 +0000
committerยท๐‘‘๐‘ด๐‘•๐‘‘๐‘ฉ๐‘ค2025-12-11 17:25:38 +0000
commit2e69e365b7834d224df41cb08cfaf8f15c4a078a (patch)
tree5b2c0c430a061ad7a944405a13843f29f1336700 /lib
parentd9dfb208407aa48d177b57715f7333ce408698f8 (diff)
downloadnixtaml-2e69e365b7834d224df41cb08cfaf8f15c4a078a.tar
nixtaml-2e69e365b7834d224df41cb08cfaf8f15c4a078a.tar.gz
nixtaml-2e69e365b7834d224df41cb08cfaf8f15c4a078a.tar.bz2
nixtaml-2e69e365b7834d224df41cb08cfaf8f15c4a078a.tar.lz
nixtaml-2e69e365b7834d224df41cb08cfaf8f15c4a078a.tar.xz
nixtaml-2e69e365b7834d224df41cb08cfaf8f15c4a078a.tar.zst
nixtaml-2e69e365b7834d224df41cb08cfaf8f15c4a078a.zip
add datetimes to meld
Diffstat (limited to 'lib')
-rw-r--r--lib/nixtamal.ml11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/nixtamal.ml b/lib/nixtamal.ml
index ff10884..5a27232 100644
--- a/lib/nixtamal.ml
+++ b/lib/nixtamal.ml
@@ -20,10 +20,11 @@ let meld_input_with_lock (input : Input.t) (lock : Lockfile.Input'.t) : Input.t
`File file
| `Archive archive, `Archive _ ->
`Archive archive
- | `Git git, `Git({latest_revision; _}: Lockfile.Git.t) ->
- `Git {git with latest_revision}
- | `Darcs darcs, `Darcs({reference; latest_weak_hash; _}: Lockfile.Darcs.t) ->
+ | `Git git, `Git({datetime; latest_revision; _}: Lockfile.Git.t) ->
+ `Git {git with datetime; latest_revision}
+ | `Darcs darcs, `Darcs({datetime; reference; latest_weak_hash; _}: Lockfile.Darcs.t) ->
`Darcs {darcs with
+ datetime;
latest_weak_hash;
reference = (
match darcs.reference, reference with
@@ -31,8 +32,8 @@ let meld_input_with_lock (input : Input.t) (lock : Lockfile.Input'.t) : Input.t
| _ -> darcs.reference
);
}
- | `Pijul pijul, `Pijul({latest_state; _}: Lockfile.Pijul.t) ->
- `Pijul {pijul with latest_state}
+ | `Pijul pijul, `Pijul({datetime; latest_state; _}: Lockfile.Pijul.t) ->
+ `Pijul {pijul with datetime; latest_state}
| _, _ -> failwith "Input kind mismatch."
);
hash = {input.hash with value = lock.hash.value};