Skip to content

Commit

Permalink
irmin-git: Update irmin-git to the last version of ocaml-git
Browse files Browse the repository at this point in the history
  • Loading branch information
@dinosaure
dinosaure committed Jan 6, 2021
1 parent f870801 commit 933bea6
Show file tree
Hide file tree
Showing 31 changed files with 374 additions and 336 deletions.
2 changes: 1 addition & 1 deletion examples/deploy.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ open Lwt.Infix
module Store = Irmin_unix.Git.FS.KV (Irmin.Contents.String)

let config =
let head = Store.Git.Reference.of_string "refs/heads/upstream" in
let head = Git.Reference.v "refs/heads/upstream" in
Irmin_git.config ~head ~bare:false Config.root

let info ~user msg () =
Expand Down
2 changes: 1 addition & 1 deletion examples/process.ml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ let images = [| (*ubuntu; *) wordpress; mysql |]

module Store = Irmin_unix.Git.FS.KV (Irmin.Contents.String)

let head = Store.Git.Reference.of_string ("refs/heads/" ^ branch images.(0))
let head = Git.Reference.v ("refs/heads/" ^ branch images.(0))

let config = Irmin_git.config ~bare:true ~head Config.root

Expand Down
18 changes: 16 additions & 2 deletions irmin-git.opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ depends: [
"dune" {>= "2.7.0"}
"irmin" {= version}
"ppx_irmin" {= version}
"git" {>= "2.1.1"}
"git"
"digestif" {>= "0.9.0"}
"cstruct"
"fmt"
Expand All @@ -29,7 +29,7 @@ depends: [
"uri"
"irmin-test" {with-test & = version}
"irmin-mem" {with-test & = version}
"git-unix" {with-test & >= "2.1.1"}
"git-unix" {with-test}
"mtime" {with-test & >= "1.0.0"}
"alcotest" {with-test}
]
Expand All @@ -39,3 +39,17 @@ description: """
`Irmin_git` expose a bi-directional bridge between Git repositories and
Irmin stores.
"""

pin-depends: [
[ "git.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "git-nss.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "git-cohttp.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "git-cohttp-unix.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "git-unix.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "carton.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "carton-git.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "carton-lwt.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "mimic.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "awa.dev" "git+https://github.com/mirage/awa-ssh.git#c337fbac71e3699ba4bcefe9382c9842354b3bee" ]
[ "awa-mirage.dev" "git+https://github.com/mirage/awa-ssh.git#c337fbac71e3699ba4bcefe9382c9842354b3bee" ]
]
1 change: 1 addition & 0 deletions irmin-graphql.opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ depends: [
"cohttp"
"fmt"
"lwt"
"mimic"
"irmin-mem" {with-test & = version}
"alcotest-lwt" {with-test & >= "1.1.0"}
"yojson" {with-test}
Expand Down
17 changes: 16 additions & 1 deletion irmin-http.opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,26 @@ depends: [
"logs"
"lwt"
"uri"
"conduit" {>= "2.1.0"}
"irmin-git" {with-test & = version}
"irmin-mem" {with-test & = version}
"irmin-test" {with-test & = version}
"git-unix" {with-test}
"git-unix"
"digestif" {with-test & >= "0.9.0"}
]

synopsis: "HTTP client and server for Irmin"

pin-depends: [
[ "git.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "git-nss.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "git-cohttp.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "git-cohttp-unix.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "git-unix.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "carton.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "carton-git.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "carton-lwt.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "mimic.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "awa.dev" "git+https://github.com/mirage/awa-ssh.git#c337fbac71e3699ba4bcefe9382c9842354b3bee" ]
[ "awa-mirage.dev" "git+https://github.com/mirage/awa-ssh.git#c337fbac71e3699ba4bcefe9382c9842354b3bee" ]
]
12 changes: 11 additions & 1 deletion irmin-mirage-git.opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ depends: [
"dune" {>= "2.7.0"}
"irmin-mirage" {= version}
"irmin-git" {= version}
"git-mirage" {>= "2.1.2"}
"mirage-kv" {>= "3.0.0"}
"cohttp"
"conduit-lwt"
"conduit-mirage"
"git-cohttp-mirage"
"fmt"
"git"
"lwt"
Expand All @@ -29,3 +29,13 @@ depends: [
]

synopsis: "MirageOS-compatible Irmin stores"

pin-depends: [
[ "git.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "git-nss.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "git-cohttp-mirage.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "carton.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "carton-git.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "carton-lwt.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "mimic.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
]
11 changes: 10 additions & 1 deletion irmin-mirage-graphql.opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,20 @@ depends: [
"dune" {>= "2.7.0"}
"irmin-mirage" {= version}
"irmin-graphql" {= version}
"git-mirage" {>= "2.1.1"}
"mirage-clock"
"cohttp-lwt"
"lwt"
"uri"
"git"
]

synopsis: "MirageOS-compatible Irmin stores"

pin-depends: [
[ "git.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "git-nss.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "carton.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "carton-git.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "carton-lwt.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "mimic.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
]
16 changes: 16 additions & 0 deletions irmin-unix.opam
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ depends: [
"astring"
"cohttp"
"cohttp-lwt"
"cohttp-lwt-unix"
"conduit"
"conduit-lwt"
"conduit-lwt-unix"
Expand All @@ -41,6 +42,7 @@ depends: [
"cohttp-lwt-unix"
"fmt"
"git"
"git-cohttp-unix"
"lwt"
"irmin-test" {with-test & = version}
"alcotest" {with-test}
Expand All @@ -52,3 +54,17 @@ description: """
as a very simple CLI tool (called `irmin`) to manipulate and inspect Irmin
stores.
"""

pin-depends: [
[ "git.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "git-nss.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "git-cohttp.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "git-cohttp-unix.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "git-unix.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "carton.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "carton-git.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "carton-lwt.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "mimic.dev" "git+https://github.com/mirage/ocaml-git.git#57853042cc14e4f414380c2c33a007d275307962" ]
[ "awa.dev" "git+https://github.com/mirage/awa-ssh.git#c337fbac71e3699ba4bcefe9382c9842354b3bee" ]
[ "awa-mirage.dev" "git+https://github.com/mirage/awa-ssh.git#c337fbac71e3699ba4bcefe9382c9842354b3bee" ]
]
Loading

0 comments on commit 933bea6

Please sign in to comment.