From ebb77bb78589f8dca49365d0f800bb20f9a8a192 Mon Sep 17 00:00:00 2001 From: Vincent Jacques Date: Sat, 10 Feb 2018 13:49:03 +0100 Subject: [PATCH 1/2] Acknowledge that jacquev6's packages support OCaml 4.06.0 This reflects the following commits: - https://github.com/jacquev6/General/commit/df2a4f9660b97a387b2793592a882b35099a38f2#diff-ce1095cc45339eed28fa39a706eac56a - https://github.com/jacquev6/JsOfOCairo/commit/3912f733fdc54ab435bf01a66c3d0b00f7672ddc#diff-91a565848e6c3dd4496c366fd0be1393 - https://github.com/jacquev6/hashids-ocaml/commit/78c1cc0374033b72f0a6453272a8156a3929314b#diff-537f3ffa3dd84ab6601fdf4a033a7b1f - https://github.com/jacquev6/DrawGrammar/commit/e8dc4732457bd931917bd26678499653dab5f37e#diff-16e2f48684fed3e20eecb51788c587d1 No code had to be modified to support of OCaml 4.06.0, so the existing archives are usable as-is, and modifying the *.opam files is enough. My package sphinxcontrib-ocaml will require more work. --- packages/DrawGrammar/DrawGrammar.0.2.1/opam | 2 +- packages/General/General.0.4.0/opam | 3 ++- packages/JsOfOCairo/JsOfOCairo.1.0.1/opam | 2 +- packages/hashids/hashids.1.0.0/opam | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/DrawGrammar/DrawGrammar.0.2.1/opam b/packages/DrawGrammar/DrawGrammar.0.2.1/opam index b4a4b776e84..7d140a347ff 100644 --- a/packages/DrawGrammar/DrawGrammar.0.2.1/opam +++ b/packages/DrawGrammar/DrawGrammar.0.2.1/opam @@ -15,4 +15,4 @@ depends: [ "cairo2" "General" {>= "0.4.0"} ] -available: [ocaml-version >= "4.02.3" & ocaml-version < "4.06.0"] +available: [ocaml-version >= "4.02.3" & ocaml-version < "4.07.0"] diff --git a/packages/General/General.0.4.0/opam b/packages/General/General.0.4.0/opam index 10bfec50eb5..b6e63bbe642 100644 --- a/packages/General/General.0.4.0/opam +++ b/packages/General/General.0.4.0/opam @@ -11,5 +11,6 @@ build-test: ["jbuilder" "runtest" "-p" name] depends: [ "jbuilder" {build} "cppo" {build & >= "1.3.0"} + "num" ] -available: [ocaml-version >= "4.02.3" & ocaml-version < "4.06.0"] +available: [ocaml-version >= "4.02.3" & ocaml-version < "4.07.0"] diff --git a/packages/JsOfOCairo/JsOfOCairo.1.0.1/opam b/packages/JsOfOCairo/JsOfOCairo.1.0.1/opam index 18e4009dcba..0fd90728909 100644 --- a/packages/JsOfOCairo/JsOfOCairo.1.0.1/opam +++ b/packages/JsOfOCairo/JsOfOCairo.1.0.1/opam @@ -15,4 +15,4 @@ depends: [ "js_of_ocaml" {>= "3.0" & < "4.0"} "cairo2" ] -available: [ocaml-version >= "4.02.3" & ocaml-version < "4.06.0"] +available: [ocaml-version >= "4.02.3" & ocaml-version < "4.07.0"] diff --git a/packages/hashids/hashids.1.0.0/opam b/packages/hashids/hashids.1.0.0/opam index ac5c38325b2..1a6b8c3e428 100644 --- a/packages/hashids/hashids.1.0.0/opam +++ b/packages/hashids/hashids.1.0.0/opam @@ -12,4 +12,4 @@ depends: [ "jbuilder" {build} "General" {>= "0.4.0"} ] -available: [ocaml-version >= "4.02.3" & ocaml-version < "4.06.0"] +available: [ocaml-version >= "4.02.3" & ocaml-version < "4.07.0"] From d7b1577ae4ccafa267f955c6f19c575786055ec2 Mon Sep 17 00:00:00 2001 From: Vincent Jacques Date: Wed, 14 Feb 2018 08:11:31 +0100 Subject: [PATCH 2/2] Remove upper OCaml version constraint on jacquev6's packages As discussed with @jpdeplaix in #11387 --- packages/DrawGrammar/DrawGrammar.0.2.1/opam | 2 +- packages/General/General.0.4.0/opam | 2 +- packages/JsOfOCairo/JsOfOCairo.1.0.1/opam | 2 +- packages/hashids/hashids.1.0.0/opam | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/DrawGrammar/DrawGrammar.0.2.1/opam b/packages/DrawGrammar/DrawGrammar.0.2.1/opam index 7d140a347ff..53ede8d03c3 100644 --- a/packages/DrawGrammar/DrawGrammar.0.2.1/opam +++ b/packages/DrawGrammar/DrawGrammar.0.2.1/opam @@ -15,4 +15,4 @@ depends: [ "cairo2" "General" {>= "0.4.0"} ] -available: [ocaml-version >= "4.02.3" & ocaml-version < "4.07.0"] +available: [ocaml-version >= "4.02.3"] diff --git a/packages/General/General.0.4.0/opam b/packages/General/General.0.4.0/opam index b6e63bbe642..3d63519e6f8 100644 --- a/packages/General/General.0.4.0/opam +++ b/packages/General/General.0.4.0/opam @@ -13,4 +13,4 @@ depends: [ "cppo" {build & >= "1.3.0"} "num" ] -available: [ocaml-version >= "4.02.3" & ocaml-version < "4.07.0"] +available: [ocaml-version >= "4.02.3"] diff --git a/packages/JsOfOCairo/JsOfOCairo.1.0.1/opam b/packages/JsOfOCairo/JsOfOCairo.1.0.1/opam index 0fd90728909..1d24ff6e21e 100644 --- a/packages/JsOfOCairo/JsOfOCairo.1.0.1/opam +++ b/packages/JsOfOCairo/JsOfOCairo.1.0.1/opam @@ -15,4 +15,4 @@ depends: [ "js_of_ocaml" {>= "3.0" & < "4.0"} "cairo2" ] -available: [ocaml-version >= "4.02.3" & ocaml-version < "4.07.0"] +available: [ocaml-version >= "4.02.3"] diff --git a/packages/hashids/hashids.1.0.0/opam b/packages/hashids/hashids.1.0.0/opam index 1a6b8c3e428..03a69d7bbdf 100644 --- a/packages/hashids/hashids.1.0.0/opam +++ b/packages/hashids/hashids.1.0.0/opam @@ -12,4 +12,4 @@ depends: [ "jbuilder" {build} "General" {>= "0.4.0"} ] -available: [ocaml-version >= "4.02.3" & ocaml-version < "4.07.0"] +available: [ocaml-version >= "4.02.3"]