[PATCH 00/37] Assorted OCaml patches

Hello Guix,

I have been collecting some patches to the OCaml packaging in Guix. It has got

a bit long, sorry for that.

The main theme of this series is to provide basic OCaml packages in Guix that

also work with more recent version of OCaml. Currently most OCaml packages in

Guix are only for OCaml 4.07.

Most patches are of following form:

- Add new ocaml-X package with latest upstream verison of X

- Make existing ocaml4.07-X package inherit from new ocaml-X

Some packages are newly added because I am using them (ocaml-uunf and

ocaml-angstrom) or because they are dependencies of newer version of packages

already in Guix (e.g. ocaml-time-now).

There are still quite a few packages in Guix that are only available for OCaml

4.07 (ocaml4.07-X but no ocaml-X). Eventually adding them would be nice for

OCaml hackers working with recent version of the compiler. As I understand we

want to keep the ocaml4.07-* packages for bootstrapping purposes.

Thanks,

pukkamustard

pukkamustard (37):

gnu: ocaml-integers: Update to 0.4.0.

gnu: ocaml-ctypes: Update to 0.18.0.

gnu: ocaml-ctypes: Make ocaml-integers a propagated input.

gnu: ocaml-lwt: Make libev a propagated input.

gnu: ocaml-lwt: Update to 5.4.0.

gnu: ocaml4.07-gen: Update to 0.5.3.

gnu: Add ocaml-gen.

gnu: Add ocaml-stdio.

gnu: Add ocaml-compiler-libs.

gnu: ocaml-migrate-parsetree: Update to 1.8.0.

gnu: ocaml-migrate-parsetree: Update to 2.1.0.

gnu: Add ocaml-ppxlib.

gnu: Add ocaml-sedlex.

gnu: Add ocaml-uunf.

gnu: Add ocaml-ppx-sexp-conv.

gnu: Add ocaml-bigstringaf.

gnu: Add ocaml-ppx-let.

gnu: Add ocaml-syntax-shims.

gnu: Add ocaml-ppx-compare.

gnu: Add ocaml-ppx-here.

gnu: Add ocaml-ppx-cold.

gnu: Add ocaml-ppx-assert.

gnu: Add ocaml-ppx-custom-printf.

gnu: Add ocaml-ppx-hash.

gnu: Add ocaml-ppx-enumerate.

gnu: Add ocaml-ppx-js-style.

gnu: Add ocaml-ppx-base.

gnu: Add ocaml-fieldslib.

gnu: Add ocaml-ppx-fields-conv.

gnu: Add ocaml-ppx-optcomp

gnu: Add ocaml-ppx-optional.

gnu: Add ocaml-jst-config.

gnu: Add ocaml-jane-street-headers.

gnu: Add ocaml-time-now.

gnu: Add ocaml-ppx-inline-test.

gnu: Add ocaml-angstrom.

gnu: Add ocaml-uri.

gnu/packages/ocaml.scm | 1476 ++++++++++++++++++++++++++--------------

1 file changed, 949 insertions(+), 527 deletions(-)

--

2.31.1

---

gnu/packages/ocaml.scm | 29 ++++++++++-------------------

1 file changed, 10 insertions(+), 19 deletions(-)

---

gnu/packages/ocaml.scm | 6 ++++--

1 file changed, 4 insertions(+), 2 deletions(-)

[inputs]: Remove ocaml-integers.

---

gnu/packages/ocaml.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

[inputs]: Remove libev.

(ocaml-ouint2, ocaml4.07-lambda-term, ocaml-markup) [inputs]: Remove libev.

---

gnu/packages/ocaml.scm | 13 +++----------

1 file changed, 3 insertions(+), 10 deletions(-)

---

gnu/packages/ocaml.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

---

gnu/packages/ocaml.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

(ocaml4.07-gen): Remove variable.

(ocaml4.07-sedlex): Replace ocaml4.07-gen with ocaml-gen.

---

gnu/packages/ocaml.scm | 17 +++++++----------

1 file changed, 7 insertions(+), 10 deletions(-)

(ocaml4.07-stdio): Inherit from ocaml-stdio.

---

gnu/packages/ocaml.scm | 58 +++++++++++++++++++++---------------------

1 file changed, 29 insertions(+), 29 deletions(-)

(ocaml4.07-compiler-libs): Inherit from ocaml-compiler-libs.

---

gnu/packages/ocaml.scm | 42 +++++++++++++++++++++++++++++-------------

1 file changed, 29 insertions(+), 13 deletions(-)

---

gnu/packages/ocaml.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

(ocaml-migrate-parsetree-1): New variable.

---

gnu/packages/ocaml.scm | 39 +++++++++++++++++++++++++++++----------

1 file changed, 29 insertions(+), 10 deletions(-)

(ocaml4.07-ppxlib): Inherit from ocaml-ppxlib.

---

gnu/packages/ocaml.scm | 144 +++++++++++++++++++++++------------------

1 file changed, 81 insertions(+), 63 deletions(-)

(ocaml4.07-sedlex): Inherit from ocaml-sedlex.

---

gnu/packages/ocaml.scm | 57 ++++++++++++++++++++++++++++--------------

1 file changed, 38 insertions(+), 19 deletions(-)

---

gnu/packages/ocaml.scm | 32 ++++++++++++++++++++++++++++++++

1 file changed, 32 insertions(+)

(ocaml4.07-ppx-sexp-conv): Inherit from ocaml-ppx-sexp-conv.

---

gnu/packages/ocaml.scm | 98 ++++++++++++++++++++++++------------------

1 file changed, 56 insertions(+), 42 deletions(-)

---

gnu/packages/ocaml.scm | 34 ++++++++++++++++++++++++++++++++++

1 file changed, 34 insertions(+)

(ocaml4.07-ppx-custom-printf): Inherit from ocaml-ppx-custom-printf.

---

gnu/packages/ocaml.scm | 59 ++++++++++++++++++++++++------------------

1 file changed, 34 insertions(+), 25 deletions(-)

(ocaml4.07-ppx-hash): Inherit from ocaml-ppx-hash.

---

gnu/packages/ocaml.scm | 72 +++++++++++++++++++++++-------------------

1 file changed, 40 insertions(+), 32 deletions(-)

---

gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

(ocaml4.07-ppx-let): Inherit from ocaml-ppx-let.

---

gnu/packages/ocaml.scm | 44 ++++++++++++++++++++++--------------------

1 file changed, 23 insertions(+), 21 deletions(-)

(ocaml4.07-ppx-compare): Inherit from ocaml-ppx-compare.

---

gnu/packages/ocaml.scm | 64 +++++++++++++++++++++++++-----------------

1 file changed, 38 insertions(+), 26 deletions(-)

(ocaml4.07-ppx-js-style): Inherit from ocaml-ppx-js-style.

---

gnu/packages/ocaml.scm | 48 +++++++++++++++++++++---------------------

1 file changed, 24 insertions(+), 24 deletions(-)

---

gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++

1 file changed, 22 insertions(+)

(ocaml4.07-ppx-assert): Inherit from ocaml-ppx-assert.

---

gnu/packages/ocaml.scm | 63 ++++++++++++++++++++++++------------------

1 file changed, 36 insertions(+), 27 deletions(-)

(ocaml4.07-fieldslib): Inherit from ocaml-fieldslib.

---

gnu/packages/ocaml.scm | 48 +++++++++++++++++++++---------------------

1 file changed, 24 insertions(+), 24 deletions(-)

---

gnu/packages/ocaml.scm | 26 +++++++++++++++++++++++++-

1 file changed, 25 insertions(+), 1 deletion(-)

(ocaml4.07-ppx-enumerate): Inherit from ocaml-ppx-enumerate.

---

gnu/packages/ocaml.scm | 54 +++++++++++++++++++++++++-----------------

1 file changed, 32 insertions(+), 22 deletions(-)

(ocaml4.07-ppx-base): Inherit from ocaml-ppx-base.

---

gnu/packages/ocaml.scm | 65 +++++++++++++++++++++++++-----------------

1 file changed, 39 insertions(+), 26 deletions(-)

(ocaml4.07-ppx-here): Inherit from ocaml-ppx-here.

---

gnu/packages/ocaml.scm | 56 ++++++++++++++++++++++--------------------

1 file changed, 29 insertions(+), 27 deletions(-)

(ocaml4.07-ppx-optcomp): Inherit from ocaml-ppx-optcomp.

---

gnu/packages/ocaml.scm | 52 +++++++++++++++++++++++++-----------------

1 file changed, 31 insertions(+), 21 deletions(-)

---

gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

(ocaml4.07-ppx-optional): Inherit from ocaml-ppx-optional.

---

gnu/packages/ocaml.scm | 48 ++++++++++++++++++++++--------------------

1 file changed, 25 insertions(+), 23 deletions(-)

---

gnu/packages/ocaml.scm | 16 ++++++++++++++++

1 file changed, 16 insertions(+)

---

gnu/packages/ocaml.scm | 37 +++++++++++++++++++++++++++++++++++++

1 file changed, 37 insertions(+)

(ocaml4.07-ppx-inline-test): Inherit from ocaml-ppx-inline-test.

---

gnu/packages/ocaml.scm | 69 ++++++++++++++++++++++++++++--------------

1 file changed, 46 insertions(+), 23 deletions(-)

---

gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++

1 file changed, 30 insertions(+)

(ocaml4.07-ppx-fields-conv): Inherit from ocaml-ppx-fields-conv.

---

gnu/packages/ocaml.scm | 58 ++++++++++++++++++++++++------------------

1 file changed, 33 insertions(+), 25 deletions(-)

On Wed, 2021-04-14 at 11:12 +0200, pukkamustard wrote:

What's the reason libev has been moved from inputs to propagated-inputs?

Note: I know practically nothing about ocaml packaging.

Greetings,

Maxime.

I'm confused what's going on here.

ocaml-qtest is for unit tests (https://opam.ocaml.org/packages/qtest/qtest.2.1.0/),

but for this package we have ‘#:tests? #f; no tests?’?

That seems contradictory.

Greetings,

Maxime.

Hi Maxime,

Thanks for your review!

Maxime Devos <maximedevos@telenet.be> writes:

As far as I understand libev is a runtime/build time dependency of

lwt.

Before this patch it was necessary for packages using lwt to also

add

libev as input (e.g. ocaml4.07-lambda-term or ocaml-markup). This

was

even worse when using lwt indirectly (e.g. by including

ocaml-markup

somewhere): build would fail but it was not clear what needs to be

done

as lwt was not directly included as input (but as propagated-input

of

ocaml-markup).

Adding libev as propagate-input makes packages using lwt "just

work".

-pukkamustard

Maxime Devos <maximedevos@telenet.be> writes:

Excellent catch! There are in fact tests and they also pass.

Please find

attached updated patch that enables tests (I can also resend the

entire

patch series as v2 if that is easier).

The `#tests? #f` was introduced with commit

5a4003f453ee8afdfe21d959e105250bfc876063 in 2019 and I blindly

copied it.

-pukkamustard

pukkamustard schreef op di 20-04-2021 om 06:11 [+0000]:

I can confirm all packages you modified still build. But I don't really

know anything about ocaml.

Greetings,

Maxime.

Hello Guix,

This is V2 of the patch series which includes the fixes suggested by Maxime for ocaml-gen and merges issue #45558 (Add js_of_ocaml by divoplade; https://issues.guix.gnu.org/45558).

This is becoming an even larger series. Please let me know if there is anything I can do to make this easier to review.

Thanks!

pukkamustard

divoplade (2):

gnu: Add ocaml-graphics.

gnu: Add ocaml-js-of-ocaml.

pukkamustard (41):

gnu: ocaml-integers: Update to 0.4.0.

gnu: ocaml-ctypes: Update to 0.18.0.

gnu: ocaml-ctypes: Make ocaml-integers a propagated input.

gnu: ocaml-lwt: Make libev a propagated input.

gnu: ocaml-lwt: Update to 5.4.0.

gnu: ocaml4.07-gen: Update to 0.5.3.

gnu: Add ocaml-gen.

gnu: Add ocaml-stdio.

gnu: Add ocaml-compiler-libs.

gnu: ocaml-migrate-parsetree: Update to 1.8.0.

gnu: ocaml-migrate-parsetree: Update to 2.1.0.

gnu: Add ocaml-ppxlib.

gnu: Add ocaml-sedlex.

gnu: Add ocaml-uunf.

gnu: Add ocaml-ppx-sexp-conv.

gnu: Add ocaml-bigstringaf.

gnu: Add ocaml-ppx-let.

gnu: Add ocaml-syntax-shims.

gnu: Add ocaml-ppx-compare.

gnu: Add ocaml-ppx-here.

gnu: Add ocaml-ppx-cold.

gnu: Add ocaml-ppx-assert.

gnu: Add ocaml-ppx-custom-printf.

gnu: Add ocaml-ppx-hash.

gnu: Add ocaml-ppx-enumerate.

gnu: Add ocaml-ppx-js-style.

gnu: Add ocaml-ppx-base.

gnu: Add ocaml-fieldslib.

gnu: Add ocaml-ppx-fields-conv.

gnu: Add ocaml-ppx-optcomp

gnu: Add ocaml-ppx-optional.

gnu: Add ocaml-jst-config.

gnu: Add ocaml-jane-street-headers.

gnu: Add ocaml-time-now.

gnu: Add ocaml-ppx-inline-test.

gnu: Add ocaml-angstrom.

gnu: Add ocaml-uri.

gnu: Add ocaml-variantslib.

gnu: Add ocaml-ppx-variants-conv.

gnu: Add ocaml-ppx-expect.

gnu: ocaml-num: Update to 1.4.

gnu/packages/ocaml.scm | 1738 ++++++++++++++++++++++++++--------------

1 file changed, 1120 insertions(+), 618 deletions(-)

--

2.31.1

---

gnu/packages/ocaml.scm | 6 ++++--

1 file changed, 4 insertions(+), 2 deletions(-)

---

gnu/packages/ocaml.scm | 29 ++++++++++-------------------

1 file changed, 10 insertions(+), 19 deletions(-)

[inputs]: Remove ocaml-integers.

---

gnu/packages/ocaml.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

[inputs]: Remove libev.

(ocaml-ouint2, ocaml4.07-lambda-term, ocaml-markup) [inputs]: Remove libev.

---

gnu/packages/ocaml.scm | 13 +++----------

1 file changed, 3 insertions(+), 10 deletions(-)

---

gnu/packages/ocaml.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

(ocaml4.07-stdio): Inherit from ocaml-stdio.

---

gnu/packages/ocaml.scm | 58 +++++++++++++++++++++---------------------

1 file changed, 29 insertions(+), 29 deletions(-)

---

gnu/packages/ocaml.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

---

gnu/packages/ocaml.scm | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

(ocaml-migrate-parsetree-1): New variable.

---

gnu/packages/ocaml.scm | 39 +++++++++++++++++++++++++++++----------

1 file changed, 29 insertions(+), 10 deletions(-)

(ocaml4.07-gen): Remove variable.

(ocaml4.07-sedlex): Replace ocaml4.07-gen with ocaml-gen.

---

gnu/packages/ocaml.scm | 19 ++++++++-----------

1 file changed, 8 insertions(+), 11 deletions(-)

(ocaml4.07-compiler-libs): Inherit from ocaml-compiler-libs.

---

gnu/packages/ocaml.scm | 42 +++++++++++++++++++++++++++++-------------

1 file changed, 29 insertions(+), 13 deletions(-)

---

gnu/packages/ocaml.scm | 32 ++++++++++++++++++++++++++++++++

1 file changed, 32 insertions(+)

(ocaml4.07-sedlex): Inherit from ocaml-sedlex.

---

gnu/packages/ocaml.scm | 57 ++++++++++++++++++++++++++++--------------

1 file changed, 38 insertions(+), 19 deletions(-)

(ocaml4.07-ppxlib): Inherit from ocaml-ppxlib.

---

gnu/packages/ocaml.scm | 144 +++++++++++++++++++++++------------------

1 file changed, 81 insertions(+), 63 deletions(-)

(ocaml4.07-ppx-sexp-conv): Inherit from ocaml-ppx-sexp-conv.

---

gnu/packages/ocaml.scm | 98 ++++++++++++++++++++++++------------------

1 file changed, 56 insertions(+), 42 deletions(-)

(ocaml4.07-ppx-compare): Inherit from ocaml-ppx-compare.

---

gnu/packages/ocaml.scm | 64 +++++++++++++++++++++++++-----------------

1 file changed, 38 insertions(+), 26 deletions(-)