From eee75f759c3f6d3a2acb11fb8314e9dcb8d02789 Mon Sep 17 00:00:00 2001 From: Marcello Seri Date: Mon, 3 Jun 2024 10:20:45 +0200 Subject: [PATCH 1/4] safemoney, sarif: dependency on ppx_expect They all fail with a variation of ``` === ERROR while compiling safemoney.0.1.1 ====================================# context 2.2.0~beta3~dev | linux/x86_64 | ocaml-base-compiler.5.2.0 | file:///home/opam/opam-repository path ~/.opam/5.2/.opam-switch/build/safemoney.0.1.1 command ~/.opam/opam-init/hooks/sandbox.sh build dune build -p safemoney -j 255 @install @runtest exit-code 1 env-file ~/.opam/log/safemoney-7-875a72.env output-file ~/.opam/log/safemoney-7-875a72.out File "test/dune", line 3, characters 43-60: 3 | (libraries safemoney_lib base core zarith ppx_expect.common ppx_expect.config ppx_expect.config_types stdint angstrom yojson) ^^^^^^^^^^^^^^^^^ Error: Library "ppx_expect.common" not found. -> required by library "safemoney_test" in _build/default/test -> required by _build/default/test/.safemoney_test.inline-tests/inline_test_runner_safemoney_test.exe -> required by alias test/runtest in test/dune:4 ``` Signed-off-by: Marcello Seri --- packages/safemoney/safemoney.0.1.1/opam | 1 + packages/sarif/sarif.0.1.0/opam | 1 + packages/sarif/sarif.0.2.0/opam | 1 + 3 files changed, 3 insertions(+) diff --git a/packages/safemoney/safemoney.0.1.1/opam b/packages/safemoney/safemoney.0.1.1/opam index 6916a899b32..410ffd807ca 100644 --- a/packages/safemoney/safemoney.0.1.1/opam +++ b/packages/safemoney/safemoney.0.1.1/opam @@ -17,6 +17,7 @@ depends: [ "re2" "yojson" "ppx_jane" {>= "v0.16.0"} + "ppx_expect" "ppx_deriving" "ppx_yojson_conv" "ppx_deriving_yojson" {< "3.8.0"} diff --git a/packages/sarif/sarif.0.1.0/opam b/packages/sarif/sarif.0.1.0/opam index 889a2c8d094..b9c7bc91f17 100644 --- a/packages/sarif/sarif.0.1.0/opam +++ b/packages/sarif/sarif.0.1.0/opam @@ -20,6 +20,7 @@ depends: [ "timedesc" "ppx_jane" "ppx_deriving" + "ppx_expect" "uri" {>= "4.4.0"} "odoc" {with-doc} ] diff --git a/packages/sarif/sarif.0.2.0/opam b/packages/sarif/sarif.0.2.0/opam index e06d8e83eb2..5e1a4b80d60 100644 --- a/packages/sarif/sarif.0.2.0/opam +++ b/packages/sarif/sarif.0.2.0/opam @@ -20,6 +20,7 @@ depends: [ "timedesc" "ppx_jane" "ppx_deriving" + "ppx_expect" "uri" {>= "4.4.0"} "odoc" {with-doc} ] From 9fbfc74f743d7cbb05b70d474fa00c7592cac135 Mon Sep 17 00:00:00 2001 From: Marcello Seri Date: Mon, 3 Jun 2024 10:22:17 +0200 Subject: [PATCH 2/4] pa_ppx >= 0.12 uses cppo It was failing with `cppo: command not found` Probably it used to get it transitively Signed-off-by: Marcello Seri --- packages/pa_ppx/pa_ppx.0.12/opam | 1 + packages/pa_ppx/pa_ppx.0.13/opam | 1 + packages/pa_ppx/pa_ppx.0.14/opam | 1 + 3 files changed, 3 insertions(+) diff --git a/packages/pa_ppx/pa_ppx.0.12/opam b/packages/pa_ppx/pa_ppx.0.12/opam index 01ffc70ed92..2e1d9424aad 100644 --- a/packages/pa_ppx/pa_ppx.0.12/opam +++ b/packages/pa_ppx/pa_ppx.0.12/opam @@ -46,6 +46,7 @@ depends: [ "bos" { >= "0.2.0" } "fmt" "uint" { >= "2.0.1" } + "cppo" "ounit" "sexplib" { with-test & >= "v0.14.0" } "ppx_import" { with-test & >= "1.7.1" } diff --git a/packages/pa_ppx/pa_ppx.0.13/opam b/packages/pa_ppx/pa_ppx.0.13/opam index 5f0b451cad1..e05aba26e8c 100644 --- a/packages/pa_ppx/pa_ppx.0.13/opam +++ b/packages/pa_ppx/pa_ppx.0.13/opam @@ -47,6 +47,7 @@ depends: [ "bos" { >= "0.2.0" } "fmt" "uint" { >= "2.0.1" } + "cppo" "ounit" "sexplib" { with-test & >= "v0.14.0" } "ppx_import" { with-test & >= "1.7.1" } diff --git a/packages/pa_ppx/pa_ppx.0.14/opam b/packages/pa_ppx/pa_ppx.0.14/opam index 49b364bc9e0..ac51edd1ab4 100644 --- a/packages/pa_ppx/pa_ppx.0.14/opam +++ b/packages/pa_ppx/pa_ppx.0.14/opam @@ -48,6 +48,7 @@ depends: [ "fmt" "uint" { >= "2.0.1" } "ounit" + "cppo" "sexplib" { with-test & >= "v0.14.0" } "ppx_import" { with-test & >= "1.7.1" } "ppx_deriving" { with-test & < "6.0.2"} From 6e405f820dc0584c2a309f316f90880e34154f6f Mon Sep 17 00:00:00 2001 From: Marcello Seri Date: Mon, 3 Jun 2024 10:22:45 +0200 Subject: [PATCH 3/4] guardian depends on the result library ``` === ERROR while compiling guardian.0.1.0 =====================================# context 2.2.0~beta3~dev | linux/x86_64 | ocaml-base-compiler.4.14.2 | file:///home/opam/opam-repository path ~/.opam/4.14/.opam-switch/build/guardian.0.1.0 command ~/.opam/opam-init/hooks/sandbox.sh build dune build -p guardian -j 31 --promote-install-files=false @install exit-code 1 env-file ~/.opam/log/guardian-7-f51419.env output-file ~/.opam/log/guardian-7-f51419.out File "lib/dune", line 5, characters 32-38: 5 | (libraries containers logs lwt result uuidm) ^^^^^^ Error: Library "result" not found. -> required by library "guardian" in _build/default/lib -> required by _build/default/META.guardian -> required by _build/install/default/lib/guardian/META -> required by _build/default/guardian.install -> required by alias install ``` Signed-off-by: Marcello Seri --- packages/guardian/guardian.0.1.0/opam | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/guardian/guardian.0.1.0/opam b/packages/guardian/guardian.0.1.0/opam index 18bb1ac01b8..0317363a38a 100644 --- a/packages/guardian/guardian.0.1.0/opam +++ b/packages/guardian/guardian.0.1.0/opam @@ -26,6 +26,7 @@ depends: [ "uri" {>= "4.2.0"} "uuidm" {>= "0.9.8"} "yojson" {>= "2.0.2"} + "result" {>= "1.5"} "odoc" {with-doc} "alcotest-lwt" {with-test} ] From 286a1b34bbd22bfa8eea6a11d6f71290d6a7136f Mon Sep 17 00:00:00 2001 From: Marcello Seri Date: Mon, 3 Jun 2024 14:24:50 +0200 Subject: [PATCH 4/4] Apply suggestions from code review --- packages/safemoney/safemoney.0.1.1/opam | 2 +- packages/sarif/sarif.0.1.0/opam | 2 +- packages/sarif/sarif.0.2.0/opam | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/safemoney/safemoney.0.1.1/opam b/packages/safemoney/safemoney.0.1.1/opam index 410ffd807ca..0170e7fd41e 100644 --- a/packages/safemoney/safemoney.0.1.1/opam +++ b/packages/safemoney/safemoney.0.1.1/opam @@ -17,7 +17,7 @@ depends: [ "re2" "yojson" "ppx_jane" {>= "v0.16.0"} - "ppx_expect" + "ppx_expect" {< "v0.17"} "ppx_deriving" "ppx_yojson_conv" "ppx_deriving_yojson" {< "3.8.0"} diff --git a/packages/sarif/sarif.0.1.0/opam b/packages/sarif/sarif.0.1.0/opam index b9c7bc91f17..3be37095989 100644 --- a/packages/sarif/sarif.0.1.0/opam +++ b/packages/sarif/sarif.0.1.0/opam @@ -20,7 +20,7 @@ depends: [ "timedesc" "ppx_jane" "ppx_deriving" - "ppx_expect" + "ppx_expect" {< "v0.17"} "uri" {>= "4.4.0"} "odoc" {with-doc} ] diff --git a/packages/sarif/sarif.0.2.0/opam b/packages/sarif/sarif.0.2.0/opam index 5e1a4b80d60..1ec20dad75f 100644 --- a/packages/sarif/sarif.0.2.0/opam +++ b/packages/sarif/sarif.0.2.0/opam @@ -20,7 +20,7 @@ depends: [ "timedesc" "ppx_jane" "ppx_deriving" - "ppx_expect" + "ppx_expect" {< "v0.17"} "uri" {>= "4.4.0"} "odoc" {with-doc} ]