Merge pull request mirage#1495 from mirage/upgrade-to-git.3.5.0

Upgrade irmin-mirage-git to git.3.5.0 and remove CoHTTP/Conduit from the dependency graph
zshipko · Aug 26, 2021 · a8d6633 · a8d6633
2 parents d768436 + e1a5146
commit a8d6633
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 16 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -106,6 +106,7 @@
     - `Irmin_git.dot_git` is now `Irmin_git.Conf.dot_git`
    (#1347, @samoht)
   - Renamed `Irmin_git.Make` into `Irmin_git.Maker` (#1369, @samoht)
+  - Upgrade `irmin-git` to `git.3.5.0`. (#1495, @dinosaure)
 
 - **irmin-mirage**
   - Renamed `Irmin_mirage_git.Make` into `Irmin_mirage_git.Maker`

diff --git a/irmin-git.opam b/irmin-git.opam
@@ -18,7 +18,7 @@ depends: [
   "dune"       {>= "2.7.0"}
   "irmin"      {= version}
   "ppx_irmin"  {= version}
-  "git"        {>= "3.4.0"}
+  "git"        {>= "3.5.0"}
   "digestif"   {>= "0.9.0"}
   "cstruct"
   "fmt"

diff --git a/irmin-http.opam b/irmin-http.opam
@@ -30,7 +30,7 @@ depends: [
   "uri"
   "irmin-git"  {with-test & = version}
   "irmin-test" {with-test & = version}
-  "git-unix"   {with-test & >= "3.4.0"}
+  "git-unix"   {with-test & >= "3.5.0"}
   "digestif"   {with-test & >= "0.9.0"}
 ]
 

diff --git a/irmin-mirage-git.opam b/irmin-mirage-git.opam
@@ -17,12 +17,9 @@ depends: [
   "irmin-mirage" {= version}
   "irmin-git"    {= version}
   "mirage-kv"    {>= "3.0.0"}
-  "cohttp"
-  "conduit-lwt"
-  "conduit-mirage"
-  "git-paf"      {>= "3.4.0"}
+  "git-paf"      {>= "3.5.0"}
   "fmt"
-  "git"          {>= "3.4.0"}
+  "git"          {>= "3.5.0"}
   "lwt"          {>= "5.3.0"}
   "mirage-clock"
   "uri"

diff --git a/irmin-unix.opam b/irmin-unix.opam
@@ -25,7 +25,7 @@ depends: [
   "irmin-pack"    {= version}
   "irmin-graphql" {= version}
   "irmin-layers"  {= version}
-  "git-unix"      {>= "3.4.0"}
+  "git-unix"      {>= "3.5.0"}
   "digestif"      {>= "0.9.0"}
   "irmin-watcher" {>= "0.2.0"}
   "yaml"          {>= "0.1.0"}
@@ -42,8 +42,8 @@ depends: [
   "cmdliner"
   "cohttp-lwt-unix"
   "fmt"
-  "git"             {>= "3.4.0"}
-  "git-cohttp-unix" {>= "3.4.0"}
+  "git"             {>= "3.5.0"}
+  "git-cohttp-unix" {>= "3.5.0"}
   "lwt"           {>= "5.3.0"}
   "irmin-test"    {with-test & = version}
   "alcotest"      {with-test}

diff --git a/src/irmin-mirage/git/dune b/src/irmin-mirage/git/dune
@@ -1,5 +1,5 @@
 (library
  (name irmin_mirage_git)
  (public_name irmin-mirage-git)
- (libraries fmt cohttp conduit-lwt conduit-mirage git irmin irmin-mirage
-   irmin-git git-paf lwt mirage-clock mirage-kv uri))
+ (libraries fmt git irmin irmin-mirage irmin-git git-paf lwt mirage-clock
+   mirage-kv uri))
diff --git a/src/irmin-mirage/git/irmin_mirage_git.ml b/src/irmin-mirage/git/irmin_mirage_git.ml
@@ -19,7 +19,6 @@ include Irmin_mirage_git_intf
 
 let remote ?(ctx = Mimic.empty) ?headers uri =
   let ( ! ) f a b = f b a in
-  let headers = Option.map Cohttp.Header.to_list headers in
   match Smart_git.Endpoint.of_string uri with
   | Ok edn ->
       let edn =

diff --git a/src/irmin-mirage/git/irmin_mirage_git_intf.ml b/src/irmin-mirage/git/irmin_mirage_git_intf.ml
@@ -20,7 +20,7 @@ module type S = sig
       with type Private.Remote.endpoint = Mimic.ctx * Smart_git.Endpoint.t
 
   val remote :
-    ?ctx:Mimic.ctx -> ?headers:Cohttp.Header.t -> string -> Irmin.remote
+    ?ctx:Mimic.ctx -> ?headers:(string * string) list -> string -> Irmin.remote
 end
 
 module type Maker = sig
@@ -67,7 +67,7 @@ module type KV_RO = sig
     ?branch:string ->
     ?root:key ->
     ?ctx:Mimic.ctx ->
-    ?headers:Cohttp.Header.t ->
+    ?headers:(string * string) list ->
     git ->
     string ->
     t Lwt.t
@@ -87,7 +87,7 @@ module type KV_RW = sig
     ?branch:string ->
     ?root:key ->
     ?ctx:Mimic.ctx ->
-    ?headers:Cohttp.Header.t ->
+    ?headers:(string * string) list ->
     ?author:(unit -> string) ->
     ?msg:([ `Set of key | `Remove of key | `Batch ] -> string) ->
     git ->