From 3252dbf7c4e093556a8f7c452333e8975f188822 Mon Sep 17 00:00:00 2001 From: Thomas Gazagnaire Date: Wed, 22 Nov 2017 11:16:02 +0100 Subject: [PATCH 1/3] Update CHANGES --- CHANGES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 288e841f56..33b3116ea5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,7 @@ +### 1.3.2 (2017-11-22) + +- support OCaml 4.06 where `-safe-string` is enabled by default (#477, @djs55) + ### 1.3.1 (2017-08-25) - irmin-http: update to cohttp.0.99 (#467, @samoht) From 02e024ba9013642422f25adb93d0a7ad6ef1e5a5 Mon Sep 17 00:00:00 2001 From: Thomas Gazagnaire Date: Wed, 22 Nov 2017 11:17:55 +0100 Subject: [PATCH 2/3] Import updates in opam files from opam-repository --- irmin.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/irmin.opam b/irmin.opam index cb6d4653b1..3e3d3381eb 100644 --- a/irmin.opam +++ b/irmin.opam @@ -15,7 +15,7 @@ build: [ depends: [ "jbuilder" {build & >= "1.0+beta10"} "result" - "fmt" + "fmt" {>= "0.8.0"} "uri" {>= "1.3.12"} "cstruct" {>= "1.6.0"} "jsonm" {>= "1.0.0"} From c9dfa382c3d18a9a569de580160a19be004f9ca9 Mon Sep 17 00:00:00 2001 From: Thomas Gazagnaire Date: Wed, 22 Nov 2017 11:21:48 +0100 Subject: [PATCH 3/3] Update opam self-constraints --- irmin-chunk.opam | 4 ++-- irmin-fs.opam | 2 +- irmin-git.opam | 2 +- irmin-http.opam | 6 +++--- irmin-mem.opam | 2 +- irmin-mirage.opam | 6 +++--- irmin-unix.opam | 10 +++++----- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/irmin-chunk.opam b/irmin-chunk.opam index 6e5a98813a..ce9c461831 100644 --- a/irmin-chunk.opam +++ b/irmin-chunk.opam @@ -14,9 +14,9 @@ build-test: ["jbuilder" "runtest" "-p" name] depends: [ "jbuilder" {build & >= "1.0+beta10"} - "irmin" {>= "1.2.0"} + "irmin" {>= "1.3.0"} "lwt" - "irmin-mem" {test & >= "1.2.0"} + "irmin-mem" {test & >= "1.3.0"} "alcotest" {test & >="0.4.1"} ] available: [ocaml-version >= "4.01.0"] diff --git a/irmin-fs.opam b/irmin-fs.opam index 2bb67658a9..7bff9fc35f 100644 --- a/irmin-fs.opam +++ b/irmin-fs.opam @@ -15,7 +15,7 @@ build-test: ["jbuilder" "runtest" "-p" name] depends: [ "jbuilder" {build & >= "1.0+beta10"} - "irmin" {>= "1.2.0"} + "irmin" {>= "1.3.0"} "alcotest" {test} "mtime" {test & >= "1.0.0"} ] diff --git a/irmin-git.opam b/irmin-git.opam index 9354266bdc..36e48aeb02 100644 --- a/irmin-git.opam +++ b/irmin-git.opam @@ -15,7 +15,7 @@ build-test: ["jbuilder" "runtest" "-p" name] depends: [ "jbuilder" {build & >= "1.0+beta10"} - "irmin" {>= "1.2.0"} + "irmin" {>= "1.3.0"} "git" {>= "1.11.0"} "alcotest" {test} "git-unix" {test & >= "1.11.0"} diff --git a/irmin-http.opam b/irmin-http.opam index 5f0efb0065..4d47564b5b 100644 --- a/irmin-http.opam +++ b/irmin-http.opam @@ -17,10 +17,10 @@ depends: [ "jbuilder" {build & >= "1.0+beta10"} "crunch" "webmachine" {>= "0.3.2"} - "irmin" {>= "1.2.0"} + "irmin" {>= "1.3.0"} "cohttp-lwt" {>= "0.99.0"} - "irmin-git" {test & >= "1.2.0"} - "irmin-mem" {test & >= "1.2.0"} + "irmin-git" {test & >= "1.3.0"} + "irmin-mem" {test & >= "1.3.0"} "alcotest" {test} "mtime" {test & >= "1.0.0"} ] diff --git a/irmin-mem.opam b/irmin-mem.opam index 2bb67658a9..7bff9fc35f 100644 --- a/irmin-mem.opam +++ b/irmin-mem.opam @@ -15,7 +15,7 @@ build-test: ["jbuilder" "runtest" "-p" name] depends: [ "jbuilder" {build & >= "1.0+beta10"} - "irmin" {>= "1.2.0"} + "irmin" {>= "1.3.0"} "alcotest" {test} "mtime" {test & >= "1.0.0"} ] diff --git a/irmin-mirage.opam b/irmin-mirage.opam index 84ce9ebb47..ced7721c64 100644 --- a/irmin-mirage.opam +++ b/irmin-mirage.opam @@ -13,9 +13,9 @@ build: [ depends: [ "jbuilder" {build & >= "1.0+beta10"} - "irmin" {>= "1.2.0"} - "irmin-git" {>= "1.2.0"} - "irmin-mem" {>= "1.2.0"} + "irmin" {>= "1.3.0"} + "irmin-git" {>= "1.3.0"} + "irmin-mem" {>= "1.3.0"} "git-mirage" {>= "1.11.0"} "ptime" "mirage-kv-lwt" diff --git a/irmin-unix.opam b/irmin-unix.opam index 6f8c490b16..1e9f0c578c 100644 --- a/irmin-unix.opam +++ b/irmin-unix.opam @@ -15,11 +15,11 @@ build-test: ["jbuilder" "runtest" "-p" name] depends: [ "jbuilder" {build & >= "1.0+beta10"} - "irmin" {>= "1.2.0"} - "irmin-mem" {>= "1.2.0"} - "irmin-git" {>= "1.2.0"} - "irmin-http" {>= "1.2.0"} - "irmin-fs" {>= "1.2.0"} + "irmin" {>= "1.3.0"} + "irmin-mem" {>= "1.3.0"} + "irmin-git" {>= "1.3.0"} + "irmin-http" {>= "1.3.0"} + "irmin-fs" {>= "1.3.0"} "git-unix" {>= "1.11.0"} "irmin-watcher" {>= "0.2.0"} "alcotest" {test}