irmin-unix: remove package

README.md

@@ -77,7 +77,6 @@ The following packages have been made available on `opam`:
 - `irmin-mirage` - mirage compatibility
 - `irmin-mirage-git` - Git compatible storage for mirage
 - `irmin-mirage-graphql` - mirage compatible GraphQL server
-- `irmin-unix` - unix compatibility
 - `irmin-pack` - compressed, on-disk, posix backend
 - `ppx_irmin` - PPX deriver for Irmin content types (see [README_PPX.md][ppx_irmin-readme])
 - `irmin-containers` - collection of simple, ready-to-use mergeable data structures

dune

@@ -2,5 +2,5 @@
 
 (mdx
  (files README.md)
- (package irmin-unix)
- (packages irmin-unix))
+ (package irmin-cli)
+ (packages irmin-cli))

examples/custom_graphql.ml

@@ -33,7 +33,7 @@ module Car = struct
   let merge = Irmin.Merge.(option (idempotent t))
 end
 
-module Store = Irmin_unix.Git.Mem.KV (Car)
+module Store = Irmin_git_unix.Mem.KV (Car)
 
 module Custom_types = struct
   module Defaults = Irmin_graphql.Server.Default_types (Store)

examples/dune

@@ -10,7 +10,15 @@
   push
   custom_graphql
   fold)
- (libraries astring cohttp fmt git irmin irmin-git irmin-unix lwt lwt.unix)
+ (libraries
+  astring
+  cohttp
+  fmt
+  irmin.unix
+  irmin-git.unix
+  irmin-graphql.unix
+  lwt
+  lwt.unix)
  (preprocess
   (pps ppx_irmin)))
 
@@ -30,7 +38,7 @@
 
 (alias
  (name runtest)
- (package irmin-unix)
+ (package irmin-git)
  (deps
   readme.exe
   trees.exe

irmin.opam

@@ -30,6 +30,7 @@ depends: [
   "mtime" {>= "1.0.0"}
   "bigstringaf" { >= "0.2.0" }
   "ppx_irmin" {= version}
+  "irmin-watcher" {>= "0.2.0"}
   "hex"      {with-test}
   "alcotest" {>= "1.1.0" & with-test}
   "alcotest-lwt" {with-test}

libirmin.opam

@@ -10,7 +10,8 @@ depends: [
   "dune" {>= "2.9"}
   "ctypes" {>= "0.19"}
   "ctypes-foreign" {>= "0.18"}
-  "irmin-unix" {= version}
+  "irmin" {= version}
+  "irmin-cli" {= version}
 ]
 build: [
   ["dune" "subst"] {dev}

src/irmin/unix/dune

@@ -0,0 +1,8 @@
+(library
+ (name irmin_unix)
+ (public_name irmin.unix)
+ (libraries irmin unix irmin-watcher)
+ (preprocess
+  (pps ppx_irmin.internal))
+ (instrumentation
+  (backend bisect_ppx)))

src/irmin-unix/info.ml → src/irmin/unix/info.ml

@@ -25,7 +25,6 @@ module Make (I : Irmin.Info.S) = struct
           match author with
           | Some a -> a
           | None ->
-              (* XXX: get "git config user.name" *)
               Printf.sprintf "Irmin %s.[%d]" (Unix.gethostname ())
                 (Unix.getpid ())
         in

test/irmin-unix/test.ml → src/irmin/unix/irmin_unix.ml

@@ -1,6 +1,5 @@
 (*
-
- * Copyright (c) 2013-2022 Thomas Gazagnaire <[email protected]>
+ * Copyright (c) 2022 Tarides <[email protected]>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,5 +14,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *)
 
-let misc = []
-let () = Irmin_test.Store.run "irmin-unix" ~misc []
+module Info = Info.Make
+module I = Info (Irmin.Info.Default)
+
+let info = I.v
+
+let set_listen_dir_hook () =
+  Irmin.Backend.Watch.set_listen_dir_hook Irmin_watcher.hook

src/irmin-unix/irmin_unix.ml → src/irmin/unix/irmin_unix.mli

@@ -1,5 +1,5 @@
 (*
- * Copyright (c) 2013-2022 Thomas Gazagnaire <[email protected]>
+ * Copyright (c) 2022 Tarides <[email protected]>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,16 +14,21 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *)
 
-let set_listen_dir_hook = Hook.init
+(** {1 Irmin Unix utilities}
 
-module I = Info.Make (Irmin.Info.Default)
-
-let info = I.v
+    This module provides utilities for Unix applications. *)
 
 module Info = Info.Make
-module Git = Irmin_git_unix
-module Http = Irmin_http_unix
-module Graphql = Irmin_graphql_unix
-module FS = Irmin_fs_unix
-module Cli = Irmin_cli
-module Resolver = Irmin_cli.Resolver
+
+val info :
+  ?author:string ->
+  ('a, Format.formatter, unit, unit -> Irmin.Info.default) format4 ->
+  'a
+(** [info fmt ()] creates a fresh commit info, with the {{!Irmin.Info.S.date}
+    date} set to [Unix.gettimeoday ()] and the {{!Irmin.Info.S.author} author}
+    built using [Unix.gethostname()] and [Unix.getpid()] if [author] is not
+    provided. *)
+
+val set_listen_dir_hook : unit -> unit
+(** Install {!Irmin_watcher.hook} as the listen hook for watching changes in
+    directories. *)