stop using camlzip

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
moby · May 18, 2017 · e3cdaa8 · e3cdaa8
1 parent c554653
commit e3cdaa8
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ RUN opam pin add irmin.1.2.0 -n https://github.com/mirage/irmin.git#81ffa256d3aa
 RUN opam pin add irmin-mem.1.2.0 -n https://github.com/mirage/irmin.git#81ffa256d3aa6b73b689609f7a5ff01c298fe821
 RUN opam pin add irmin-git.1.2.0 -n https://github.com/mirage/irmin.git#81ffa256d3aa6b73b689609f7a5ff01c298fe821
 
-RUN opam depext -ui lwt inotify alcotest conf-libev asl win-eventlog camlzip \
+RUN opam depext -ui lwt inotify alcotest conf-libev asl win-eventlog \
     irmin-watcher mtime mirage-flow conduit hvsock prometheus-app git irmin \
     cmdliner protocol-9p rresult win-error named-pipe
 

diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -16,7 +16,7 @@ RUN opam pin add irmin-http.1.2.0 -n https://github.com/mirage/irmin.git#81ffa25
 RUN opam pin add irmin-git.1.2.0 -n https://github.com/mirage/irmin.git#81ffa256d3aa6b73b689609f7a5ff01c298fe821
 RUN opam pin add irmin-unix.1.2.0 -n https://github.com/mirage/irmin.git#81ffa256d3aa6b73b689609f7a5ff01c298fe821
 
-RUN opam depext -i asl win-eventlog camlzip alcotest mtime mirage-flow hvsock \
+RUN opam depext -i asl win-eventlog alcotest mtime mirage-flow hvsock \
     git irmin irmin-unix lwt protocol-9p-unix tyxml redis multipart-form-data \
     pbkdf tls prometheus-app github git session irmin irmin-unix cmdliner \
     webmachine alcotest

diff --git a/Dockerfile.github b/Dockerfile.github
@@ -14,7 +14,7 @@ RUN opam pin add irmin-git.1.2.0 -n https://github.com/mirage/irmin.git#81ffa256
 
 RUN opam depext -ui lwt inotify alcotest conf-libev lambda-term cmdliner \
     github protocol-9p rresult prometheus-app asl win-eventlog mtime hex \
-    github-hooks hvsock camlzip irmin-watcher git irmin
+    github-hooks hvsock irmin-watcher git irmin
 
 COPY check-libev.ml /tmp/check-libev.ml
 RUN opam config exec -- ocaml /tmp/check-libev.ml

diff --git a/ci/tests/test_utils.ml b/ci/tests/test_utils.ml
@@ -1,3 +1,6 @@
+module Maker = Irmin_git.Mem.Make(Datakit_io.IO)(Git.Inflate.M)
+module Store = Ivfs_tree.Make(Maker)
+
 open Datakit_github
 open Result
 open Lwt.Infix
@@ -25,9 +28,6 @@ let or_fail msg = function
   | None -> Alcotest.fail msg
   | Some x -> x
 
-module Maker = Irmin_git.Mem.Make(Datakit_io.IO)(Datakit_io.Zlib)
-module Store = Ivfs_tree.Make(Maker)
-
 let config = Irmin_mem.config ()
 
 (*

diff --git a/datakit.opam b/datakit.opam
@@ -23,7 +23,6 @@ depends: [
   "irmin"       {>= "1.1.0"}
   "irmin-mem"
   "irmin-git"   {>= "1.0.0"}
-  "camlzip"     {>= "1.06"}
   "cstruct"     {>= "2.2"}
   "result"
   "lwt"         {>= "3.0.0"}

diff --git a/src/datakit-io/datakit_io.ml b/src/datakit-io/datakit_io.ml
@@ -415,5 +415,3 @@ module FS = struct
       )
 
 end
-
-module Zlib = Git.Inflate.Make(Zlib)
diff --git a/src/datakit-io/datakit_io.mli b/src/datakit-io/datakit_io.mli
@@ -1,3 +1,2 @@
 module IO: Irmin_git.IO
-module Zlib: Git.Inflate.S
 module FS: Git.FS.IO
diff --git a/src/datakit-io/jbuild b/src/datakit-io/jbuild
@@ -3,5 +3,4 @@
 (library
  ((name        datakit_io)
   (wrapped     false)
-  (libraries   (irmin-git conduit.lwt-unix zip))
- ))
+  (libraries   (irmin-git conduit.lwt-unix))))
diff --git a/src/datakit/bin/main.ml b/src/datakit/bin/main.ml
@@ -47,7 +47,7 @@ let info msg =
 
 module Git_fs_store = struct
   open Datakit_io
-  module Maker = Irmin_git.FS.Make(IO)(Zlib)(FS)
+  module Maker = Irmin_git.FS.Make(IO)(Git.Inflate.M)(FS)
   module Store = Ivfs_tree.Make(Maker)
   type t = Store.Repo.t
   module Filesystem = Ivfs.Make(Store)
@@ -68,7 +68,7 @@ end
 
 module In_memory_store = struct
   open Datakit_io
-  module Maker = Irmin_git.Mem.Make(IO)(Zlib)
+  module Maker = Irmin_git.Mem.Make(IO)(Git.Inflate.M)
   module Store = Ivfs_tree.Make(Maker)
   type t = Store.Repo.t
   module Filesystem = Ivfs.Make(Store)

diff --git a/tests/common/test_utils.ml b/tests/common/test_utils.ml
@@ -97,7 +97,7 @@ let () =
   Logs.set_reporter (reporter ());
   ()
 
-module Maker = Irmin_git.Mem.Make(Datakit_io.IO)(Datakit_io.Zlib)
+module Maker = Irmin_git.Mem.Make(Datakit_io.IO)(Git.Inflate.M)
 module Store = Ivfs_tree.Make(Maker)
 module RW = Ivfs_rw.Make(Store)
 module Filesystem = Ivfs.Make(Store)