[PATCH 00/14] Add ocaml-lsp-server and its dependencies

Hello,

These patches add ocaml-lsp-server package.

A lot of dependencies were required, but for most of them, this is just

a dune subpackage.

For ocaml-dune-build-info, note that I included the patch from [0]

and I used the same technique for other dune packages.

The latest version of ocaml-lsp-server depends on ocaml-merlin-lib.

I added a compatible version as a new package instead of upgrading

current ocaml-merlin-lib as I was not sure if it would be safe to do so.

Finally, the version 1.6.1 is supporting ocaml 5.0 and 5.1 [1] but I only

tested for 5.0.

Also, as 4.14 is not compatible with it, I only made public version 5.0

of it. I do not no either if was the good thing to be done.

I tested lsp server localy and it has been working fine with neovim for

my usage.

[0] https://issues.guix.gnu.org/63947

[1] https://github.com/ocaml/ocaml-lsp/blob/master/CHANGES.md#1161

Benjamin (14):

gnu: Fix ocaml-dune-build-info

gnu: Add ocaml-dune-rpc.

gnu: Add ocaml-chrome-trace.

gnu: Add ocaml-dyn.

gnu: Add ocaml-stdune.

gnu: Add ocaml-fiber.

gnu: Add ocaml-xdg.

gnu: Add ocaml-ordering.

gnu: Add ocamlc-loc.

gnu: Add ocamlformat-rpc-lib.

gnu: Add ocaml-pp.

gnu: Add ocaml-ppx-yojson-conv-lib.

gnu: Add ocaml-merlin-lib-4.9.

gnu: Add ocaml-lsp-server.

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

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

base-commit: dcca13ed7340f17a33a4c0907c13b64d5da66a8e

--

2.40.1

to make it compatible with package-with-ocaml5.0

---

gnu/packages/ocaml.scm | 1 +

1 file changed, 1 insertion(+)

---

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

1 file changed, 24 insertions(+)

---

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

1 file changed, 21 insertions(+)

---

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

1 file changed, 18 insertions(+)

---

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

1 file changed, 21 insertions(+)

---

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

1 file changed, 20 insertions(+)

---

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

1 file changed, 19 insertions(+)

---

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

1 file changed, 20 insertions(+)

---

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

1 file changed, 14 insertions(+)

---

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

1 file changed, 18 insertions(+)

---

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

1 file changed, 31 insertions(+)

---

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

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

---

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

1 file changed, 17 insertions(+)

---

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

1 file changed, 43 insertions(+)

Hi,

Benjamin <benjamin@uvy.fr> skribis:

I’m not on the OCaml team, so I’ll let Julien and pukkamustard comment.

One issue: could you work on improving synopses and descriptions a bit

and submit a v2, as per

https://guix.gnu.org/manual/en/html_node/Synopses-and-Descriptions.html?

Don’t spend hours on this, but at least try to have sentences with a

bit of context in ‘description’.

Thanks in advance!

Ludo’.

Hi,

Thanks for the patches!

Couldn't look at everything yet, just some initial remarks.

Benjamin <benjamin@uvy.fr> writes:

Lgtm, this patch would fix #63947.

There seems to be an issue with the ordering of the patches. I can not

build ocaml-dune-rpc, as it requires ocaml-ordering which is only

available a couple of commits later.

In general, try to make things build at every commit. In this case it

requires re-ordering the commits.

Could you explain why the 'remove-vendor phase is needed? It seems like

if code is vendored it should maybe also be removed in the `dune`

package?

As Ludo mentioned, the description and synopses could use a little bit

of improvement. For example descriptions should be full sentences.

We need a more descriptive description.

I guess the descriptions come from OPAM. Unfortunately Guix has stricter

requirements than OPAM...:)

-pukkamustard

---

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

1 file changed, 13 insertions(+)

---

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

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

Hi

I’am updating, my first series of patches.

I bumped ocaml-lsp-server to latest patch

I reordered commits so that each package can be built for each commit

I did this because I saw that opam build is doing this way :

If those vendor files are not remove, there was some errors when

building ocaml-stdune

```

File "otherlibs/stdune/path.mli", line 1:

Error: The files otherlibs/stdune/.stdune.objs/byte/stdune__Path_intf.cmi

and /gnu/store/wig75gdqm284z6y89dcd75fmxzim307a-ocaml5.0-pp-1.1.2/lib/ocaml/site-lib/pp/pp.cmi

make inconsistent assumptions over interface Pp

error: in phase 'build': uncaught exception:

%exception #<&invoke-error program: "dune" arguments: ("build" "@install" "-p" "stdune") exit-status: 1 term-signal: #f stop-signal: #f>

phase `build' failed after 1.8 seconds

command "dune" "build" "@install" "-p" "stdune" failed with status 1

builder for `/gnu/store/cb2n85al5bqn6q3pcaiil01p9wvfbpvw-ocaml5.0-stdune-3.6.1.drv' failed with exit code 1

build of /gnu/store/cb2n85al5bqn6q3pcaiil01p9wvfbpvw-ocaml5.0-stdune-3.6.1.drv failed

```

Because it has been repeated for each dune sublibraries, it probably

make sense to share this part of the code.

Though I don't know if we can directly do that for dune as those

vendoring are not removed here https://github.com/ocaml/dune/blob/main/dune.opam

You are right, I just took descriptions from opam and did not edit them

I updated some of the description and synopsis. Tell if it is enough.

As I don't exactly know what packages are doing, I just picked up descriptions

from source files comments

Tell me if you have other comments on those patches

Best

Benjamin

Benjamin (14):

gnu: Fix ocaml-dune-build-info

gnu: Add ocaml-pp.

gnu: Add ocamlformat-rpc-lib.

gnu: Add ocaml-ppx-yojson-conv-lib.

gnu: Add ocaml-ordering.

gnu: Add ocaml-dyn.

gnu: Add ocaml-stdune.

gnu: Add ocaml-chrome-trace.

gnu: Add ocaml-xdg.

gnu: Add ocamlc-loc.

gnu: Add ocaml-fiber.

gnu: Add ocaml-dune-rpc.

gnu: Add ocaml-merlin-lib-4.9.

gnu: Add ocaml-lsp-server.

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

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

base-commit: b20e5bcafd9654a767ffb78eefd7494f73ca67c8

--

2.41.0

to make it compatible with package-with-ocaml5.0

---

gnu/packages/ocaml.scm | 1 +

1 file changed, 1 insertion(+)

---

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

1 file changed, 31 insertions(+)

---

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

1 file changed, 19 insertions(+)

---

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

1 file changed, 19 insertions(+)

---

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

1 file changed, 21 insertions(+)

---

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

1 file changed, 23 insertions(+)

---

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

1 file changed, 19 insertions(+)

---

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

1 file changed, 20 insertions(+)

---

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

1 file changed, 22 insertions(+)

---

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

1 file changed, 17 insertions(+)

---

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

1 file changed, 24 insertions(+)

---

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

1 file changed, 43 insertions(+)

Hi,

Thanks for the update. I haven't been able to check it thoroughly yet.

Unfortunately the synopsis/descriptions still need a bit of polish. For

example (non-exhaustive):

- ocaml-pp: The synopsis should indicate that it is an OCaml

library. For markup (in this case hyerplinks) you must use the Texinfo

markup (see https://guix.gnu.org/manual/en/guix.html#Synopses-and-Descriptions).

- ocamlformat-rpc-lib: Final sentence is missing a punctuation.

- ocaml-ppx-yojson-conv-lib: See ocaml-ppx-fields-conv for an example of

a better description/synopsis.

- ocaml-dyn: Missing punctiation mark.

- ocaml-stdune: Not sure about the description.

- ocaml-xdg: Description should be more than just a link.

Also maybe we first re-solve #63947 (https://issues.guix.gnu.org/63947;

friendly ping to Julien) instead of re-fixining it in this series.

Cheers,

pukkamustard

to make it compatible with package-with-ocaml5.0

---

gnu/packages/ocaml.scm | 1 +

1 file changed, 1 insertion(+)

Hello,

Here we go for the third revision.

- I rebase on latest master

- I updated synopsies and added "ocaml" in all of then.

- I updated descriptions, add a final "." in all of them and tried to

make them more understanable

Tell me if there is more to be changed. I'll try to fix changes much

faster than last time.

Best

Benjamin

Benjamin (14):

gnu: Fix ocaml-dune-build-info

gnu: Add ocaml-pp.

gnu: Add ocamlformat-rpc-lib.

gnu: Add ocaml-ppx-yojson-conv-lib.

gnu: Add ocaml-ordering.

gnu: Add ocaml-dyn.

gnu: Add ocaml-stdune.

gnu: Add ocaml-chrome-trace.

gnu: Add ocaml-xdg.

gnu: Add ocamlc-loc.

gnu: Add ocaml-fiber.

gnu: Add ocaml-dune-rpc.

gnu: Add ocaml-merlin-lib-4.9.

gnu: Add ocaml-lsp-server.

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

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

base-commit: bb3ab24a296ffa5273b2e82a02ed057e90c095f3

--

2.41.0

Change-Id: Ic1782f531515802facb7fbcaea35405feffe2dc3

---

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

1 file changed, 27 insertions(+)

Change-Id: I960fb7bb4647c1ec1def870d5ec5afe6411347cf

---

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

1 file changed, 13 insertions(+)

Change-Id: Iff772e4492ec80071ba99ba473164da9440a1f63

---

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

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

Change-Id: I358f4759e050c2d2d24f611a70149bf38e2f1c59

---

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

1 file changed, 19 insertions(+)

Change-Id: I4f35a5e3e9271f70cfd88845964d24257d1d0ddf

---

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

1 file changed, 19 insertions(+)

Change-Id: I3c761ff694a0be32171df0fa3f57c6930b9c5438

---

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

1 file changed, 22 insertions(+)

Change-Id: Iac602da6a41ed99264c9a20fac989d43e2e9ed0d

---

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

1 file changed, 21 insertions(+)

Change-Id: Ie4246d9e655fafd60e650ac8043bdc6d51bcb737

---

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

1 file changed, 20 insertions(+)

Change-Id: I6f07101aa27eb5879ab8c33a72e4278ba09b6b92

---

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

1 file changed, 20 insertions(+)

Change-Id: I712cc3d907915fe9e1a0d3ff9e02bd6514130645

---

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

1 file changed, 20 insertions(+)

---

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

1 file changed, 17 insertions(+)

Change-Id: Iccdb76ffa3ca7a896de9f349939df77dfaca35f8

---

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

1 file changed, 24 insertions(+)

---

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

1 file changed, 43 insertions(+)

4th patch with a rebase on master.

This simplifies a bit the series as there were some dependencies that

have been added like ocaml-dyn or ocaml-stdune.

I fixed dune-ordering so that package-with-ocaml5.0 can work.

This is because it inherits from dune with some properties. cf issue [1]

that can also be closed.

I updated ocaml-dune-build-info following what has been done for other

libraries of dune repositories.

I updated merlin-lib to latest because lsp-server was requiring higher

version.

Running

./pre-inst-env guix build ocaml-merlin ocaml5.0-merlin ocaml-lsp-server ocaml5.0-lsp-server

could build merlin and ocaml-lsp-server so I guess it should be fine.

Tell me if anything needs to be changed for this patch to be merged in

master.

Best

[1] https://issues.guix.gnu.org/63947

Benjamin (11):

gnu: Fix dune-ordering

gnu: Add ocaml-ppx-yojson-conv-lib.

gnu: Fix ocaml-dune-build-info

gnu: Add ocaml-xdg.

gnu: Add dune-rpc.

gnu: Add ocamlc-loc.

gnu: Add ocaml-chrome-trace.

gnu: Add ocaml-fiber.

gnu: Add ocamlformat-rpc-lib.

gnu: ocaml-merlin-lib: Update to 4.14.

gnu: Add ocaml-lsp-server.

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

1 file changed, 174 insertions(+), 5 deletions(-)

base-commit: bf530017f0e847ae895919b32ef37d79fa636a1e

--

2.41.0

Change-Id: Ifd7d64e88dc873bff08ac393779ecc86594455a1

---

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

1 file changed, 23 insertions(+)

Change-Id: I24dd519d913ea240c3500b824e2342a33d34ed1a

---

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

1 file changed, 16 insertions(+)

Change-Id: I5b2117f34eca6d55b95413a7fefc29c4acdee7e5

---

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

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

Change-Id: Ib861dea3d7d00d570f253ffc3b4955e547dc2676

---

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

1 file changed, 42 insertions(+)

Change-Id: Ibfab7cde463c806a89836bc42e3b84720fbf7206

---

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

1 file changed, 25 insertions(+)

Change-Id: Ic6488d3517d9bb4dc5a2e55d93be3ceee2103a3e

---

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

1 file changed, 19 insertions(+)

Change-Id: I88bc2fd7bb55d721ce1887a727480338dea0590c

---

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

1 file changed, 15 insertions(+)

Change-Id: I0bcc2666d8030f067b964647400ff31e9302d1c7

---

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

1 file changed, 16 insertions(+)

it, and its inherited packages compatible with package-with-ocaml5.0

Change-Id: I07dc1e9fe32903a019da846cd6e40333619a3f36

---

gnu/packages/ocaml.scm | 1 +

1 file changed, 1 insertion(+)

Change-Id: If936fc70e541c5bf93bb021d8cc9f770b2d5329d

---

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

1 file changed, 12 insertions(+)

other dune packages

Change-Id: I6836bbe6a9860aee8e5fc672e65a1c577690d324

---

gnu/packages/ocaml.scm | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)