From 10768ece36e3934af6bca2c02949148f1476787a Mon Sep 17 00:00:00 2001 From: Chet Murthy Date: Thu, 12 Dec 2024 14:39:49 -0800 Subject: [PATCH 01/10] release pa_ppx.0.16 to support ocaml 5.3.0 syntax changes --- packages/pa_ppx/pa_ppx.0.16/opam | 75 ++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 packages/pa_ppx/pa_ppx.0.16/opam diff --git a/packages/pa_ppx/pa_ppx.0.16/opam b/packages/pa_ppx/pa_ppx.0.16/opam new file mode 100644 index 00000000000..957c14a5122 --- /dev/null +++ b/packages/pa_ppx/pa_ppx.0.16/opam @@ -0,0 +1,75 @@ + +synopsis: "PPX Rewriters for Ocaml, written using Camlp5" +description: +""" +This is a collection of PPX rewriters, re-implementing those based on ppxlib +and other libraries, but instead based on Camlp5. Included is also a collection +of support libraries for writing new PPX rewriters. Included are: + +pa_assert: ppx_assert +pa_ppx.deriving, pa_ppx.deriving_plugins (enum, eq, fold, iter, make, map, ord, sexp, show, yojson): + ppx_deriving, plugins, ppx_sexp_conv, ppx_deriving_yojson +pa_ppx.expect_test: ppx_expect_test +pa_ppx.here: ppx_here +pa_ppx.import: ppx_import +pa_ppx.inline_test: ppx_inline_test + +pa_ppx.undo_deriving: pa_ppx.deriving expands [@@deriving ...] into code; this rewriter undoes that. +pa_ppx.unmatched_vala: expands to match-cases (support library for camlp5-based PPX rewriters) +pa_ppx.hashrecons: support for writing AST rewriters that automatically fills in hash-consing boilerplate +pa_dock: implements doc-comment extraction for camlp5 preprocessors + +Many of the reimplementations in fact offer significant enhanced +function, described in the pa_ppx documentation. In addition, there +is an extensive test-suite, much of it slightly modified versions of +the tests for the respective PPX rewriters. + +""" +opam-version: "2.0" +maintainer: "Chet Murthy " +authors: ["Chet Murthy"] +homepage: "https://github.com/camlp5/pa_ppx" +license: "BSD-3-Clause" +bug-reports: "https://github.com/camlp5/pa_ppx/issues" +dev-repo: "git+https://github.com/camlp5/pa_ppx.git" +doc: "https://github.com/camlp5/pa_ppx/doc" + +depends: [ + "ocaml" { >= "4.10.0" & < "5.04.0" } + "conf-perl" + "camlp5-buildscripts" { >= "0.03" } + "camlp5" { >= "8.03.01" } + "not-ocamlfind" { >= "0.10" } + "pcre2" + "result" { >= "1.5" } + "yojson" { >= "1.7.0" } + "sexplib0" + "bos" { >= "0.2.0" } + "fmt" + "uint" { >= "2.0.1" } + "ounit" + "cppo" + "sexplib" { with-test & >= "v0.14.0" } + "ppx_import" { with-test & >= "1.7.1" & <= "1.11.0" } + "ppx_deriving" { with-test & >= "6.0.2" } + "ppx_deriving_yojson" { with-test & >= "3.5.2" & >= "3.8.0" } + "ppx_here" { with-test & >= "v0.13.0" } + "ppx_sexp_conv" { with-test & >= "v0.13.0" } +# "expect_test_helpers" { with-test & >= "v0.13.0" } +] +conflicts: [ + "ocaml-option-bytecode-only" + "pa_ppx_migrate" { <= "0.11" } +] +build: [ + [make "get-generated"] + [make "-j%{jobs}%" "DEBUG=-g" "sys"] + [make "DEBUG=-g" "test"] {with-test} +] +install: [make "install"] +url { + src: "https://github.com/camlp5/pa_ppx/archive/refs/tags/0.16.tar.gz" + checksum: [ + "sha512=a5c4e7214e46e6c6223875f1cb56885e495c8c3ee4c39c67e3324d46d9362d8dbfbf11099701817ce7df3148b155100bfa07809c32a3fd3836267e447d88155f" + ] +} From f40a7ab19a34131490f00a8abac0754b29be57fa Mon Sep 17 00:00:00 2001 From: Chet Murthy Date: Fri, 13 Dec 2024 11:31:50 -0800 Subject: [PATCH 02/10] exclude failing revdeps packages --- packages/pa_ppx/pa_ppx.0.16/opam | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/pa_ppx/pa_ppx.0.16/opam b/packages/pa_ppx/pa_ppx.0.16/opam index 957c14a5122..2f55ab46d56 100644 --- a/packages/pa_ppx/pa_ppx.0.16/opam +++ b/packages/pa_ppx/pa_ppx.0.16/opam @@ -60,6 +60,8 @@ depends: [ conflicts: [ "ocaml-option-bytecode-only" "pa_ppx_migrate" { <= "0.11" } + "pa_ppx_q_ast" { < "0.13" } + "pa_ppx_regexp" { < "0.03" } ] build: [ [make "get-generated"] From f813099299a774fec5f1fa11f1d78b223bda2215 Mon Sep 17 00:00:00 2001 From: Chet Murthy Date: Sun, 15 Dec 2024 15:49:57 -0800 Subject: [PATCH 03/10] maintainer-suggested cleanup --- packages/pa_ppx/pa_ppx.0.16/opam | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/pa_ppx/pa_ppx.0.16/opam b/packages/pa_ppx/pa_ppx.0.16/opam index 2f55ab46d56..bc1a8e2536a 100644 --- a/packages/pa_ppx/pa_ppx.0.16/opam +++ b/packages/pa_ppx/pa_ppx.0.16/opam @@ -59,7 +59,6 @@ depends: [ ] conflicts: [ "ocaml-option-bytecode-only" - "pa_ppx_migrate" { <= "0.11" } "pa_ppx_q_ast" { < "0.13" } "pa_ppx_regexp" { < "0.03" } ] From 37f2ae6af6ebf7c3468614d84c772e72aaec3dae Mon Sep 17 00:00:00 2001 From: Chet Murthy Date: Sun, 15 Dec 2024 17:11:54 -0800 Subject: [PATCH 04/10] push updated opam file --- packages/pa_ppx/pa_ppx.0.16/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pa_ppx/pa_ppx.0.16/opam b/packages/pa_ppx/pa_ppx.0.16/opam index bc1a8e2536a..942a35cd19b 100644 --- a/packages/pa_ppx/pa_ppx.0.16/opam +++ b/packages/pa_ppx/pa_ppx.0.16/opam @@ -71,6 +71,6 @@ install: [make "install"] url { src: "https://github.com/camlp5/pa_ppx/archive/refs/tags/0.16.tar.gz" checksum: [ - "sha512=a5c4e7214e46e6c6223875f1cb56885e495c8c3ee4c39c67e3324d46d9362d8dbfbf11099701817ce7df3148b155100bfa07809c32a3fd3836267e447d88155f" + "sha512=4dbd81f09b82054e00a8afece81022eb901f8b446170fcf514c80f106575b4bd03dccd13ba1acf6f830ee11aeec43f90cbf361399ee2c905ea56bdc24b817545" ] } From 456f360c5c93146f98ea9fbea76a334442b0b35a Mon Sep 17 00:00:00 2001 From: Chet Murthy Date: Sun, 15 Dec 2024 20:01:22 -0800 Subject: [PATCH 05/10] exclude pa_ppx.0.16 --- packages/pa_ppx_migrate/pa_ppx_migrate.0.11/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pa_ppx_migrate/pa_ppx_migrate.0.11/opam b/packages/pa_ppx_migrate/pa_ppx_migrate.0.11/opam index 3b586373011..f76dbb84705 100644 --- a/packages/pa_ppx_migrate/pa_ppx_migrate.0.11/opam +++ b/packages/pa_ppx_migrate/pa_ppx_migrate.0.11/opam @@ -26,7 +26,7 @@ depends: [ "cppo" { >= "1.6.9" } "camlp5-buildscripts" { >= "0.02" } "camlp5" { >= "8.01.00" } - "pa_ppx" { >= "0.12" } + "pa_ppx" { >= "0.12" & < "0.16" } "not-ocamlfind" { >= "0.10" } "ounit" { >= "2.2.7" & with-test} "fmt" From b18d4e9b26210a198df31b1959e206e439d48b38 Mon Sep 17 00:00:00 2001 From: Chet Murthy Date: Sun, 15 Dec 2024 20:47:41 -0800 Subject: [PATCH 06/10] back out capping pa_ppx_migrate, b/c can't build it anymore Debian doesn't appear to ship libpcre-dev anymore. --- packages/pa_ppx/pa_ppx.0.16/opam | 1 + packages/pa_ppx_migrate/pa_ppx_migrate.0.11/opam | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/pa_ppx/pa_ppx.0.16/opam b/packages/pa_ppx/pa_ppx.0.16/opam index 942a35cd19b..f92f5cc1d8c 100644 --- a/packages/pa_ppx/pa_ppx.0.16/opam +++ b/packages/pa_ppx/pa_ppx.0.16/opam @@ -59,6 +59,7 @@ depends: [ ] conflicts: [ "ocaml-option-bytecode-only" + "pa_ppx_migrate" { <= "0.11" } "pa_ppx_q_ast" { < "0.13" } "pa_ppx_regexp" { < "0.03" } ] diff --git a/packages/pa_ppx_migrate/pa_ppx_migrate.0.11/opam b/packages/pa_ppx_migrate/pa_ppx_migrate.0.11/opam index f76dbb84705..3b586373011 100644 --- a/packages/pa_ppx_migrate/pa_ppx_migrate.0.11/opam +++ b/packages/pa_ppx_migrate/pa_ppx_migrate.0.11/opam @@ -26,7 +26,7 @@ depends: [ "cppo" { >= "1.6.9" } "camlp5-buildscripts" { >= "0.02" } "camlp5" { >= "8.01.00" } - "pa_ppx" { >= "0.12" & < "0.16" } + "pa_ppx" { >= "0.12" } "not-ocamlfind" { >= "0.10" } "ounit" { >= "2.2.7" & with-test} "fmt" From 57f48cab30b9df188c5e6a466e26bb854c9424de Mon Sep 17 00:00:00 2001 From: Chet Murthy Date: Mon, 16 Dec 2024 01:23:07 -0800 Subject: [PATCH 07/10] move conflicts over to the affected packages --- packages/pa_ppx/pa_ppx.0.16/opam | 3 --- packages/pa_ppx_migrate/pa_ppx_migrate.0.11/opam | 2 +- packages/pa_ppx_q_ast/pa_ppx_q_ast.0.12/opam | 2 +- packages/pa_ppx_regexp/pa_ppx_regexp.0.03/opam | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/packages/pa_ppx/pa_ppx.0.16/opam b/packages/pa_ppx/pa_ppx.0.16/opam index f92f5cc1d8c..cd2581bf705 100644 --- a/packages/pa_ppx/pa_ppx.0.16/opam +++ b/packages/pa_ppx/pa_ppx.0.16/opam @@ -59,9 +59,6 @@ depends: [ ] conflicts: [ "ocaml-option-bytecode-only" - "pa_ppx_migrate" { <= "0.11" } - "pa_ppx_q_ast" { < "0.13" } - "pa_ppx_regexp" { < "0.03" } ] build: [ [make "get-generated"] diff --git a/packages/pa_ppx_migrate/pa_ppx_migrate.0.11/opam b/packages/pa_ppx_migrate/pa_ppx_migrate.0.11/opam index 3b586373011..f76dbb84705 100644 --- a/packages/pa_ppx_migrate/pa_ppx_migrate.0.11/opam +++ b/packages/pa_ppx_migrate/pa_ppx_migrate.0.11/opam @@ -26,7 +26,7 @@ depends: [ "cppo" { >= "1.6.9" } "camlp5-buildscripts" { >= "0.02" } "camlp5" { >= "8.01.00" } - "pa_ppx" { >= "0.12" } + "pa_ppx" { >= "0.12" & < "0.16" } "not-ocamlfind" { >= "0.10" } "ounit" { >= "2.2.7" & with-test} "fmt" diff --git a/packages/pa_ppx_q_ast/pa_ppx_q_ast.0.12/opam b/packages/pa_ppx_q_ast/pa_ppx_q_ast.0.12/opam index b071c5e0db1..99315f4e59e 100644 --- a/packages/pa_ppx_q_ast/pa_ppx_q_ast.0.12/opam +++ b/packages/pa_ppx_q_ast/pa_ppx_q_ast.0.12/opam @@ -22,7 +22,7 @@ depends: [ "cppo" { >= "1.6.9" } "camlp5-buildscripts" { >= "0.01" } "camlp5" { >= "8.03.00" } - "pa_ppx" { >= "0.15" } + "pa_ppx" { = "0.15" } "pa_ppx_migrate" { with-test & >= "0.08" } "pa_ppx_hashcons" { >= "0.08" } "pa_ppx_unique" { >= "0.08" } diff --git a/packages/pa_ppx_regexp/pa_ppx_regexp.0.03/opam b/packages/pa_ppx_regexp/pa_ppx_regexp.0.03/opam index 9470e0a61a4..927fa1dabe0 100644 --- a/packages/pa_ppx_regexp/pa_ppx_regexp.0.03/opam +++ b/packages/pa_ppx_regexp/pa_ppx_regexp.0.03/opam @@ -18,7 +18,7 @@ depends: [ "ocaml" { >= "4.10.0" } "camlp5-buildscripts" { >= "0.02" } "camlp5" { >= "8.01.00" } - "pa_ppx" { >= "0.15" } + "pa_ppx" { = "0.15" } "pa_ppx_migrate" { >= "0.10" } "pa_ppx_static" { >= "0.01" } "not-ocamlfind" { >= "0.10" } From 84be58dd52cdb22d139724ac9dfac670ef48d93b Mon Sep 17 00:00:00 2001 From: Chet Murthy Date: Mon, 16 Dec 2024 11:29:57 -0800 Subject: [PATCH 08/10] ignore CI failures on opensuse --- packages/pa_ppx/pa_ppx.0.16/opam | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/pa_ppx/pa_ppx.0.16/opam b/packages/pa_ppx/pa_ppx.0.16/opam index cd2581bf705..6851b18c4c2 100644 --- a/packages/pa_ppx/pa_ppx.0.16/opam +++ b/packages/pa_ppx/pa_ppx.0.16/opam @@ -26,6 +26,7 @@ the tests for the respective PPX rewriters. """ opam-version: "2.0" +x-maintenance-intent: [ "(latest)" ] maintainer: "Chet Murthy " authors: ["Chet Murthy"] homepage: "https://github.com/camlp5/pa_ppx" @@ -33,6 +34,7 @@ license: "BSD-3-Clause" bug-reports: "https://github.com/camlp5/pa_ppx/issues" dev-repo: "git+https://github.com/camlp5/pa_ppx.git" doc: "https://github.com/camlp5/pa_ppx/doc" +x-ci-accept-failures: [ "opensuse-tumbleweed" ] depends: [ "ocaml" { >= "4.10.0" & < "5.04.0" } From 2d3edfc7f915107463edd8a4e29db6e1b0c5801d Mon Sep 17 00:00:00 2001 From: Chet Murthy Date: Mon, 16 Dec 2024 18:11:15 -0800 Subject: [PATCH 09/10] accept CI failures on opensuse-tumbleweed --- packages/pa_ppx_q_ast/pa_ppx_q_ast.0.12/opam | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/pa_ppx_q_ast/pa_ppx_q_ast.0.12/opam b/packages/pa_ppx_q_ast/pa_ppx_q_ast.0.12/opam index 99315f4e59e..911900f179b 100644 --- a/packages/pa_ppx_q_ast/pa_ppx_q_ast.0.12/opam +++ b/packages/pa_ppx_q_ast/pa_ppx_q_ast.0.12/opam @@ -14,6 +14,7 @@ license: "BSD-3-Clause" bug-reports: "https://github.com/camlp5/pa_ppx_q_ast/issues" dev-repo: "git+https://github.com/camlp5/pa_ppx_q_ast.git" doc: "https://github.com/camlp5/pa_ppx_q_ast/doc" +x-ci-accept-failures: [ "opensuse-tumbleweed" ] depends: [ "ocaml" { >= "4.10.0" } From 88463e19cb9f225f651e211f929afe711bf5b8a8 Mon Sep 17 00:00:00 2001 From: Marcello Seri Date: Wed, 18 Dec 2024 12:55:38 +0100 Subject: [PATCH 10/10] Update packages/pa_ppx/pa_ppx.0.16/opam --- packages/pa_ppx/pa_ppx.0.16/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pa_ppx/pa_ppx.0.16/opam b/packages/pa_ppx/pa_ppx.0.16/opam index 6851b18c4c2..4cb96e3ff70 100644 --- a/packages/pa_ppx/pa_ppx.0.16/opam +++ b/packages/pa_ppx/pa_ppx.0.16/opam @@ -54,7 +54,7 @@ depends: [ "sexplib" { with-test & >= "v0.14.0" } "ppx_import" { with-test & >= "1.7.1" & <= "1.11.0" } "ppx_deriving" { with-test & >= "6.0.2" } - "ppx_deriving_yojson" { with-test & >= "3.5.2" & >= "3.8.0" } + "ppx_deriving_yojson" { with-test & >= "3.8.0" } "ppx_here" { with-test & >= "v0.13.0" } "ppx_sexp_conv" { with-test & >= "v0.13.0" } # "expect_test_helpers" { with-test & >= "v0.13.0" }