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

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

[Benjamin]

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

[bug#64209] [PATCH 01/14] gnu: Fix ocaml-dune-build-info

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-dune-build-info): fix ocaml-dune-build-info
  to make it compatible with package-with-ocaml5.0
---
 gnu/packages/ocaml.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index ab0aa0574a..7aa87ca4df 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9658,6 +9658,7 @@ (define-public ocaml-dune-build-info
     (inherit dune)
     (name "ocaml-dune-build-info")
     (build-system dune-build-system)
+    (properties '())
     (arguments
      '(#:package "dune-build-info"
        ;; No separate test suite from dune.
-- 
2.40.1

[bug#64209] [PATCH 02/14] gnu: Add ocaml-dune-rpc.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-dune-rpc): New variable.
---
 gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 7aa87ca4df..18825f607a 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9672,6 +9672,30 @@ (define-public ocaml-dune-build-info
 reporting the version from the version control system during development to
 get an precise reference of when the executable was built.")))
 
+(define-public ocaml-dune-rpc
+  (package
+    (inherit dune)
+    (name "ocaml-dune-rpc")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "dune-rpc"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-csexp
+                             ocaml-ordering
+                             ocaml-dyn
+                             ocaml-xdg
+                             ocaml-stdune
+                             ocaml-pp
+                             ocaml-odoc))
+    (properties '())
+    (synopsis "Communicate with dune using rpc")
+    (description "Library to connect and control a running dune instance")))
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.40.1

[bug#64209] [PATCH 03/14] gnu: Add ocaml-chrome-trace.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-chrome-trace): New variable.
---
 gnu/packages/ocaml.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 18825f607a..078c7837e7 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9696,6 +9696,27 @@ (define-public ocaml-dune-rpc
     (synopsis "Communicate with dune using rpc")
     (description "Library to connect and control a running dune instance")))
 
+(define-public ocaml-chrome-trace
+  (package
+    (inherit dune)
+    (name "ocaml-chrome-trace")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "chrome-trace"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-odoc))
+    (properties '())
+    (synopsis "Chrome trace event generation library")
+    (description
+     "This library offers no backwards compatibility guarantees.  Use at your own
+risk.")
+    (license license:expat)))
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.40.1

[bug#64209] [PATCH 04/14] gnu: Add ocaml-dyn.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-dyn): New variable.
---
 gnu/packages/ocaml.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 078c7837e7..5ad86c7c20 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9717,6 +9717,24 @@ (define-public ocaml-chrome-trace
 risk.")
     (license license:expat)))
 
+(define-public ocaml-dyn
+  (package
+    (inherit dune)
+    (name "ocaml-dyn")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "dyn"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-ordering ocaml-pp ocaml-odoc))
+    (properties '())
+    (synopsis "Dynamic type")
+    (description "Dynamic type")))
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.40.1

[bug#64209] [PATCH 05/14] gnu: Add ocaml-stdune.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-stdune): New variable.
---
 gnu/packages/ocaml.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 5ad86c7c20..3e5fe7c92a 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9735,6 +9735,27 @@ (define-public ocaml-dyn
     (synopsis "Dynamic type")
     (description "Dynamic type")))
 
+(define-public ocaml-stdune
+  (package
+    (inherit dune)
+    (name "ocaml-stdune")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "stdune"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-dyn ocaml-ordering ocaml-pp ocaml-csexp
+                             ocaml-odoc))
+    (properties '())
+    (synopsis "Dune's unstable standard library")
+    (description
+     "This library offers no backwards compatibility guarantees.  Use at your own
+risk.")))
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.40.1

[bug#64209] [PATCH 06/14] gnu: Add ocaml-fiber.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-fiber): New variable.
---
 gnu/packages/ocaml.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 3e5fe7c92a..730a6ee014 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9756,6 +9756,26 @@ (define-public ocaml-stdune
      "This library offers no backwards compatibility guarantees.  Use at your own
 risk.")))
 
+(define-public ocaml-fiber
+  (package
+    (inherit dune)
+    (name "ocaml-fiber")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "fiber"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-stdune ocaml-dyn ocaml-odoc))
+    (properties '())
+    (synopsis "Structured concurrency library")
+    (description
+     "This library offers no backwards compatibility guarantees.  Use at your own
+risk.")))
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.40.1

[bug#64209] [PATCH 07/14] gnu: Add ocaml-xdg.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-xdg): New variable.
---
 gnu/packages/ocaml.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 730a6ee014..da3794ad33 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9776,6 +9776,25 @@ (define-public ocaml-fiber
      "This library offers no backwards compatibility guarantees.  Use at your own
 risk.")))
 
+(define-public ocaml-xdg
+  (package
+    (inherit dune)
+    (name "ocaml-xdg")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "xdg"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-odoc))
+    (properties '())
+    (synopsis "XDG Base Directory Specification")
+    (description
+     "https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html")))
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.40.1

[bug#64209] [PATCH 08/14] gnu: Add ocaml-ordering.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-ordering): New variable.
---
 gnu/packages/ocaml.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index da3794ad33..0d856aad8a 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9795,6 +9795,24 @@ (define-public ocaml-xdg
     (description
      "https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html")))
 
+(define-public ocaml-ordering
+  (package
+    (inherit dune)
+    (name "ocaml-ordering")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "ordering"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-odoc))
+    (properties '())
+    (synopsis "Element ordering")
+    (description "Element ordering")))
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.40.1

[bug#64209] [PATCH 09/14] gnu: Add ocamlc-loc.

[Benjamin]

* gnu/packages/ocaml.scm (ocamlc-loc): New variable.
---
 gnu/packages/ocaml.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 0d856aad8a..e482541d60 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9813,6 +9813,26 @@ (define-public ocaml-ordering
     (synopsis "Element ordering")
     (description "Element ordering")))
 
+(define-public ocamlc-loc
+  (package
+    (inherit dune)
+    (name "ocamlc-loc")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "ocamlc-loc"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-dyn ocaml-odoc))
+    (properties '())
+    (synopsis "Parse ocaml compiler output into structured form")
+    (description
+     "This library offers no backwards compatibility guarantees.  Use at your own
+risk.")))
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.40.1

[bug#64209] [PATCH 10/14] gnu: Add ocamlformat-rpc-lib.

[Benjamin]

* gnu/packages/ocaml.scm (ocamlformat-rpc-lib): New variable.
---
 gnu/packages/ocaml.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index e482541d60..30eb7e2209 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9908,6 +9908,20 @@ (define-public ocamlformat
 a uniform style.")
     (license license:expat)))
 
+(define-public ocamlformat-rpc-lib
+  (package
+    (inherit ocamlformat)
+    (name "ocamlformat-rpc-lib")
+    (arguments
+     '(#:package "ocamlformat-rpc-lib"
+       #:tests? #f))
+    (propagated-inputs (list ocaml-csexp ocaml-odoc))
+    (synopsis "Auto-formatter for OCaml code (RPC mode)")
+    (description
+     "OCamlFormat is a tool to automatically format OCaml code in a uniform style.
+This package defines a RPC interface to OCamlFormat")))
+
+
 (define-public ocaml-bigstringaf
   (package
     (name "ocaml-bigstringaf")
-- 
2.40.1

[bug#64209] [PATCH 11/14] gnu: Add ocaml-pp.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-pp): New variable.
---
 gnu/packages/ocaml.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 30eb7e2209..ffc7a9e5e9 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -2015,6 +2015,37 @@ (define-public ocaml5.0-csexp
     (propagated-inputs
      `(("ocaml-result" ,ocaml5.0-result)))))
 
+(define-public ocaml-pp
+  (package
+    (name "ocaml-pp")
+    (version "1.1.2")
+    (home-page "https://github.com/ocaml-dune/pp")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url home-page)
+                     (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0w7gxa85ffbd6jgs6ziarq69yi423f0qkpk05r3abh6lg8smw8pg"))))
+    (build-system dune-build-system)
+    (native-inputs (list ocaml-ppx-expect))
+    (synopsis "Pretty-printing library")
+    (description
+     "This library provides a lean alternative to the Format [1] module of the OCaml
+standard library.  It aims to make it easy for users to do the right thing.  If
+you have tried Format before but find its API complicated and difficult to use,
+then Pp might be a good choice for you.  Pp uses the same concepts of boxes and
+break hints, and the final rendering is done to formatter from the Format
+module.  However it defines its own algebra which some might find easier to work
+with and reason about.  No previous knowledge is required to start using this
+library, however the various guides for the Format module such as this one [2]
+should be applicable to Pp as well. [1]:
+https://caml.inria.fr/pub/docs/manual-ocaml/libref/Format.html [2]:
+http://caml.inria.fr/resources/doc/guides/format.en.html")
+    (license license:expat)))
+
 (define-public ocaml-migrate-parsetree
   (package
     (name "ocaml-migrate-parsetree")
-- 
2.40.1

[bug#64209] [PATCH 12/14] gnu: Add ocaml-ppx-yojson-conv-lib.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-ppx-yojson-conv-lib): New variable.
---
 gnu/packages/ocaml.scm | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index ffc7a9e5e9..794a7a96d3 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6170,7 +6170,28 @@ (define-public ocaml-yojson
 yojson package.  The program @code{atdgen} can be used to derive OCaml-JSON
 serializers and deserializers from type definitions.")
     (license license:bsd-3)))
- 
+
+(define-public ocaml-ppx-yojson-conv-lib
+  (package
+    (name "ocaml-ppx-yojson-conv-lib")
+    (version "0.15.0")
+    (home-page "https://github.com/janestreet/ppx_yojson_conv_lib")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+          (url home-page)
+          (commit (string-append "v" version))))
+        (sha256
+         (base32
+          "0slc5cwy60vx8gskmn20hmndjncpp5zs80a9wm7hxv8yl003i60y"))))
+    (build-system dune-build-system)
+    (propagated-inputs (list ocaml-yojson))
+    (properties `((upstream-name . "ppx_yojson_conv_lib")))
+    (synopsis "Runtime lib for ppx_yojson_conv")
+    (description "Part of the Jane Street's PPX rewriters collection.")
+    (license license:expat)))
+
 (define-public ocaml-merlin-lib
   (package
     (name "ocaml-merlin-lib")
-- 
2.40.1

[bug#64209] [PATCH 13/14] gnu: Add ocaml-merlin-lib-4.9.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-merlin-lib-4.9): New variable.
---
 gnu/packages/ocaml.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 794a7a96d3..726f47a0e4 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6238,6 +6238,23 @@ (define ocaml-merlin-lib-500
 (define-public ocaml5.0-merlin-lib
   (package-with-ocaml5.0 ocaml-merlin-lib-500))
 
+(define-public ocaml-merlin-lib-4.9
+  (package
+    (inherit ocaml-merlin-lib)
+    (name "ocaml-merlin-lib")
+    (version "4.9-500")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ocaml/merlin")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "186rb6cj9a18jhss3pablp48s7pl5xbmx8ih1dxbfh2wa3hvsdsb"))))
+    (properties '())))
+
 (define-public ocaml-dot-merlin-reader
   (package
     (inherit ocaml-merlin-lib)
-- 
2.40.1

[bug#64209] [PATCH 14/14] gnu: Add ocaml-lsp-server.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-lsp-server): New variable.
---
 gnu/packages/ocaml.scm | 43 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 726f47a0e4..5306c7881a 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6331,6 +6331,49 @@ (define-public ocaml5.0-merlin
 Atom.")
      (license license:expat))))
 
+;this package is not public because 1.16.1 only support ocaml 5.0 and 5.1
+(define ocaml-lsp-server
+  (package
+    (name "ocaml-lsp-server")
+    (version "1.16.1")
+    (home-page "https://github.com/ocaml/ocaml-lsp")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                (url home-page)
+                (commit version)))
+              (sha256
+               (base32
+                "09410g0mmwhgcrxyygdzabmx26ahsa5madcs38ah2b6jygic4dzb"))))
+    (build-system dune-build-system)
+    (arguments '(#:tests? #f)) ; tests are failing for v1.16.1
+    (propagated-inputs (list ocaml-merlin-lib-4.9
+                             ocamlformat-rpc-lib
+                             ocaml-pp
+                             ocamlc-loc
+                             ocaml-spawn
+                             ocaml-ordering
+                             ocaml-fiber
+                             ocaml-dyn
+                             ocaml-dune-rpc
+                             ocaml-re
+                             ocaml-csexp
+                             ocaml-uutf
+                             ocaml-odoc-parser
+                             ocaml-dune-build-info
+                             ocaml-xdg
+                             ocaml-stdune
+                             ocaml-chrome-trace
+                             ocaml-ppx-yojson-conv-lib
+                             ocaml-yojson))
+    (native-inputs (list ocaml-ppx-expect ocamlformat ocaml-odoc))
+    (properties `((upstream-name . "ocaml-lsp-server")))
+    (synopsis "LSP Server for OCaml")
+    (description "An LSP server for OCaml.")
+    (license license:isc)))
+
+(define-public ocaml5.0-lsp-server (package-with-ocaml5.0 ocaml-lsp-server))
+
 (define-public ocaml-gsl
   (package
     (name "ocaml-gsl")
-- 
2.40.1

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

[Ludovic Courtès]

Hi,

Benjamin <benjamin@uvy.fr> skribis:

> 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

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’.

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

[pukkamustard]

Hi,

Thanks for the patches!

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

Benjamin <benjamin@uvy.fr> writes:

> Hello,
>
> These patches add ocaml-lsp-server package.
>
> ...
>
> Benjamin (14):
>   gnu: Fix ocaml-dune-build-info

Lgtm, this patch would fix #63947.

>   gnu: Add ocaml-dune-rpc.

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.

>   gnu: Add ocaml-chrome-trace.

We need a more descriptive description.

I guess the descriptions come from OPAM. Unfortunately Guix has stricter
requirements than OPAM...:)

-pukkamustard

[bug#64209] [PATCH v2 00/14] Reorder commits and better descriptions

[Benjamin]

Hi

I’am updating, my first series of patches.

I bumped ocaml-lsp-server to latest patch

> 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.

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

> 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?

I did this because I saw that opam build is doing this way :
https://github.com/ocaml/dune/blob/main/dyn.opam#L21-L22

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

> We need a more descriptive description.

> I guess the descriptions come from OPAM. Unfortunately Guix has stricter
> requirements than 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

[bug#64209] [PATCH v2 01/14] gnu: Fix ocaml-dune-build-info

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-dune-build-info): fix ocaml-dune-build-info
  to make it compatible with package-with-ocaml5.0
---
 gnu/packages/ocaml.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 8ff755aea9..552afc4784 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9657,6 +9657,7 @@ (define-public ocaml-dune-build-info
     (inherit dune)
     (name "ocaml-dune-build-info")
     (build-system dune-build-system)
+    (properties '())
     (arguments
      '(#:package "dune-build-info"
        ;; No separate test suite from dune.
-- 
2.41.0

[bug#64209] [PATCH v2 02/14] gnu: Add ocaml-pp.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-pp): New variable.
---
 gnu/packages/ocaml.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 552afc4784..e664f33955 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -2014,6 +2014,37 @@ (define-public ocaml5.0-csexp
     (propagated-inputs
      `(("ocaml-result" ,ocaml5.0-result)))))
 
+(define-public ocaml-pp
+  (package
+    (name "ocaml-pp")
+    (version "1.1.2")
+    (home-page "https://github.com/ocaml-dune/pp")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url home-page)
+                     (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0w7gxa85ffbd6jgs6ziarq69yi423f0qkpk05r3abh6lg8smw8pg"))))
+    (build-system dune-build-system)
+    (native-inputs (list ocaml-ppx-expect))
+    (synopsis "Pretty-printing library")
+    (description
+     "This library provides a lean alternative to the Format [1] module of the OCaml
+standard library.  It aims to make it easy for users to do the right thing.  If
+you have tried Format before but find its API complicated and difficult to use,
+then Pp might be a good choice for you.  Pp uses the same concepts of boxes and
+break hints, and the final rendering is done to formatter from the Format
+module.  However it defines its own algebra which some might find easier to work
+with and reason about.  No previous knowledge is required to start using this
+library, however the various guides for the Format module such as this one [2]
+should be applicable to Pp as well. [1]:
+https://caml.inria.fr/pub/docs/manual-ocaml/libref/Format.html [2]:
+http://caml.inria.fr/resources/doc/guides/format.en.html")
+    (license license:expat)))
+
 (define-public ocaml-migrate-parsetree
   (package
     (name "ocaml-migrate-parsetree")
-- 
2.41.0

[bug#64209] [PATCH v2 03/14] gnu: Add ocamlformat-rpc-lib.

[Benjamin]

* gnu/packages/ocaml.scm (ocamlformat-rpc-lib): New variable.
---
 gnu/packages/ocaml.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index e664f33955..1da68ab162 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9777,6 +9777,19 @@ (define-public ocamlformat
 a uniform style.")
     (license license:expat)))
 
+(define-public ocamlformat-rpc-lib
+  (package
+    (inherit ocamlformat)
+    (name "ocamlformat-rpc-lib")
+    (arguments
+     '(#:package "ocamlformat-rpc-lib"
+       #:tests? #f))
+    (propagated-inputs (list ocaml-csexp ocaml-odoc))
+    (synopsis "Auto-formatter for OCaml code in RPC mode")
+    (description
+     "OCamlFormat is a tool to automatically format OCaml code in a uniform style.
+This package defines a RPC interface to OCamlFormat")))
+
 (define-public ocaml-bigstringaf
   (package
     (name "ocaml-bigstringaf")
-- 
2.41.0

[bug#64209] [PATCH v2 04/14] gnu: Add ocaml-ppx-yojson-conv-lib.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-ppx-yojson-conv-lib): New variable.
---
 gnu/packages/ocaml.scm | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 1da68ab162..ec21a26d19 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6169,7 +6169,28 @@ (define-public ocaml-yojson
 yojson package.  The program @code{atdgen} can be used to derive OCaml-JSON
 serializers and deserializers from type definitions.")
     (license license:bsd-3)))
- 
+
+(define-public ocaml-ppx-yojson-conv-lib
+  (package
+    (name "ocaml-ppx-yojson-conv-lib")
+    (version "0.15.0")
+    (home-page "https://github.com/janestreet/ppx_yojson_conv_lib")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+          (url home-page)
+          (commit (string-append "v" version))))
+        (sha256
+         (base32
+          "0slc5cwy60vx8gskmn20hmndjncpp5zs80a9wm7hxv8yl003i60y"))))
+    (build-system dune-build-system)
+    (propagated-inputs (list ocaml-yojson))
+    (properties `((upstream-name . "ppx_yojson_conv_lib")))
+    (synopsis "Runtime lib for ppx_yojson_conv")
+    (description "This library is a part of the Jane Street's PPX rewriters collection.")
+    (license license:expat)))
+
 (define-public ocaml-merlin-lib
   (package
     (name "ocaml-merlin-lib")
-- 
2.41.0

[bug#64209] [PATCH v2 05/14] gnu: Add ocaml-ordering.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-ordering): New variable.
---
 gnu/packages/ocaml.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index ec21a26d19..45e34c7d66 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9723,6 +9723,25 @@ (define-public ocaml-dune-build-info
 reporting the version from the version control system during development to
 get an precise reference of when the executable was built.")))
 
+(define-public ocaml-ordering
+  (package
+    (inherit dune)
+    (name "ocaml-ordering")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "ordering"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-odoc))
+    (properties '())
+    (synopsis "Element ordering library")
+    (description "This library implement element ordering and a convenient
+operator for efficiently chaining multiple comparisons together.")))
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.41.0

[bug#64209] [PATCH v2 06/14] gnu: Add ocaml-dyn.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-dyn): New variable.
---
 gnu/packages/ocaml.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 45e34c7d66..88a72a2220 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9723,6 +9723,25 @@ (define-public ocaml-dune-build-info
 reporting the version from the version control system during development to
 get an precise reference of when the executable was built.")))
 
+(define-public ocaml-dyn
+  (package
+    (inherit dune)
+    (name "ocaml-dyn")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "dyn"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-ordering ocaml-pp ocaml-odoc))
+    (properties '())
+    (synopsis "Dynamic type library")
+    (description "Representation of OCaml values such that they can be
+processed without knowing their type")))
+
 (define-public ocaml-ordering
   (package
     (inherit dune)
-- 
2.41.0

[bug#64209] [PATCH v2 07/14] gnu: Add ocaml-stdune.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-stdune): New variable.
---
 gnu/packages/ocaml.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 88a72a2220..fb7612ee1b 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9742,6 +9742,27 @@ (define-public ocaml-dyn
     (description "Representation of OCaml values such that they can be
 processed without knowing their type")))
 
+(define-public ocaml-stdune
+  (package
+    (inherit dune)
+    (name "ocaml-stdune")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "stdune"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-dyn ocaml-ordering ocaml-pp ocaml-csexp
+                             ocaml-odoc))
+    (properties '())
+    (synopsis "Dune's unstable standard library")
+    (description
+     "This library is dune standard library. It offers no backwards
+compatibility guarantees. You should use it at your own risk.")))
+
 (define-public ocaml-ordering
   (package
     (inherit dune)
-- 
2.41.0

[bug#64209] [PATCH v2 08/14] gnu: Add ocaml-chrome-trace.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-chrome-trace): New variable.
---
 gnu/packages/ocaml.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index fb7612ee1b..e037009ae8 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9723,6 +9723,29 @@ (define-public ocaml-dune-build-info
 reporting the version from the version control system during development to
 get an precise reference of when the executable was built.")))
 
+(define-public ocaml-chrome-trace
+  (package
+    (inherit dune)
+    (name "ocaml-chrome-trace")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "chrome-trace"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-odoc))
+    (properties '())
+    (synopsis "Chrome trace event generation library")
+    (description
+     "Output trace data to a file in Chrome's trace_event format. This format is
+    compatible with chrome trace viewer [chrome://tracing].
+    This library offers no backwards compatibility guarantees.  Use at your own
+risk.")
+    (license license:expat)))
+
 (define-public ocaml-dyn
   (package
     (inherit dune)
-- 
2.41.0

[bug#64209] [PATCH v2 09/14] gnu: Add ocaml-xdg.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-xdg): New variable.
---
 gnu/packages/ocaml.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index e037009ae8..3d36c9ec7d 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9786,6 +9786,25 @@ (define-public ocaml-stdune
      "This library is dune standard library. It offers no backwards
 compatibility guarantees. You should use it at your own risk.")))
 
+(define-public ocaml-xdg
+  (package
+    (inherit dune)
+    (name "ocaml-xdg")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "xdg"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-odoc))
+    (properties '())
+    (synopsis "XDG Base Directory Specification")
+    (description
+     "https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html")))
+
 (define-public ocaml-ordering
   (package
     (inherit dune)
-- 
2.41.0

[bug#64209] [PATCH v2 10/14] gnu: Add ocamlc-loc.

[Benjamin]

* gnu/packages/ocaml.scm (ocamlc-loc): New variable.
---
 gnu/packages/ocaml.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 3d36c9ec7d..c0cb55ac32 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9824,6 +9824,26 @@ (define-public ocaml-ordering
     (description "This library implement element ordering and a convenient
 operator for efficiently chaining multiple comparisons together.")))
 
+(define-public ocamlc-loc
+  (package
+    (inherit dune)
+    (name "ocamlc-loc")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "ocamlc-loc"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-dyn ocaml-odoc))
+    (properties '())
+    (synopsis "Parse ocaml compiler output into structured form")
+    (description
+     "This library offers no backwards compatibility guarantees.  Use at your own
+risk.")))
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.41.0

[bug#64209] [PATCH v2 11/14] gnu: Add ocaml-fiber.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-fiber): New variable.
---
 gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index c0cb55ac32..1958e19028 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9786,6 +9786,28 @@ (define-public ocaml-stdune
      "This library is dune standard library. It offers no backwards
 compatibility guarantees. You should use it at your own risk.")))
 
+(define-public ocaml-fiber
+  (package
+    (inherit dune)
+    (name "ocaml-fiber")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "fiber"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-stdune ocaml-dyn ocaml-odoc))
+    (properties '())
+    (synopsis "Structured concurrency library")
+    (description
+     "This library implements structured concurrency :
+     https://en.wikipedia.org/wiki/Structured_concurrency
+     It offers no backwards compatibility guarantees. Use at your own
+risk.")))
+
 (define-public ocaml-xdg
   (package
     (inherit dune)
-- 
2.41.0

[bug#64209] [PATCH v2 12/14] gnu: Add ocaml-dune-rpc.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-dune-rpc): New variable.
---
 gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 1958e19028..50cd80e761 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9723,6 +9723,30 @@ (define-public ocaml-dune-build-info
 reporting the version from the version control system during development to
 get an precise reference of when the executable was built.")))
 
+(define-public ocaml-dune-rpc
+  (package
+    (inherit dune)
+    (name "ocaml-dune-rpc")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "dune-rpc"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-csexp
+                             ocaml-ordering
+                             ocaml-dyn
+                             ocaml-xdg
+                             ocaml-stdune
+                             ocaml-pp
+                             ocaml-odoc))
+    (properties '())
+    (synopsis "Communicate with dune using rpc")
+    (description "Library to connect and control a running dune instance")))
+
 (define-public ocaml-chrome-trace
   (package
     (inherit dune)
-- 
2.41.0

[bug#64209] [PATCH v2 13/14] gnu: Add ocaml-merlin-lib-4.9.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-merlin-lib-4.9): New variable.
---
 gnu/packages/ocaml.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 50cd80e761..b57c61ff8c 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6237,6 +6237,23 @@ (define ocaml-merlin-lib-500
 (define-public ocaml5.0-merlin-lib
   (package-with-ocaml5.0 ocaml-merlin-lib-500))
 
+(define-public ocaml-merlin-lib-4.9
+  (package
+    (inherit ocaml-merlin-lib)
+    (name "ocaml-merlin-lib")
+    (version "4.9-500")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ocaml/merlin")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "186rb6cj9a18jhss3pablp48s7pl5xbmx8ih1dxbfh2wa3hvsdsb"))))
+    (properties '())))
+
 (define-public ocaml-dot-merlin-reader
   (package
     (inherit ocaml-merlin-lib)
-- 
2.41.0

[bug#64209] [PATCH v2 14/14] gnu: Add ocaml-lsp-server.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-lsp-server): New variable.
---
 gnu/packages/ocaml.scm | 43 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index b57c61ff8c..ee87e84c0b 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6330,6 +6330,49 @@ (define-public ocaml5.0-merlin
 Atom.")
      (license license:expat))))
 
+;this package is not public because 1.16.1 only support ocaml 5.0 and 5.1
+(define ocaml-lsp-server
+  (package
+    (name "ocaml-lsp-server")
+    (version "1.16.2")
+    (home-page "https://github.com/ocaml/ocaml-lsp")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                (url home-page)
+                (commit version)))
+              (sha256
+               (base32
+                "1nd1655allyml2qpr6asxv3d2pdq5clw7vx7zx9bfiawyi2szsn8"))))
+    (build-system dune-build-system)
+    (arguments '(#:tests? #f)) ; tests are failing for v1.16.1
+    (propagated-inputs (list ocaml-merlin-lib-4.9
+                             ocamlformat-rpc-lib
+                             ocaml-pp
+                             ocamlc-loc
+                             ocaml-spawn
+                             ocaml-ordering
+                             ocaml-fiber
+                             ocaml-dyn
+                             ocaml-dune-rpc
+                             ocaml-re
+                             ocaml-csexp
+                             ocaml-uutf
+                             ocaml-odoc-parser
+                             ocaml-dune-build-info
+                             ocaml-xdg
+                             ocaml-stdune
+                             ocaml-chrome-trace
+                             ocaml-ppx-yojson-conv-lib
+                             ocaml-yojson))
+    (native-inputs (list ocaml-ppx-expect ocamlformat ocaml-odoc))
+    (properties `((upstream-name . "ocaml-lsp-server")))
+    (synopsis "LSP Server for OCaml")
+    (description "This package implements an Ocaml language server implementation.")
+    (license license:isc)))
+
+(define-public ocaml5.0-lsp-server (package-with-ocaml5.0 ocaml-lsp-server))
+
 (define-public ocaml-gsl
   (package
     (name "ocaml-gsl")
-- 
2.41.0

[bug#64209] [PATCH v2 00/14] Reorder commits and better descriptions

[pukkamustard]

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

[bug#64209] [PATCH v3 00/14] improve synopsies and descriptions

[Benjamin]

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

[bug#64209] [PATCH v3 01/14] gnu: Fix ocaml-dune-build-info

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-dune-build-info): fix ocaml-dune-build-info
  to make it compatible with package-with-ocaml5.0
---
 gnu/packages/ocaml.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 7993dbaa73..2fd2f8e9f9 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9627,6 +9627,7 @@ (define-public ocaml-dune-build-info
     (inherit dune)
     (name "ocaml-dune-build-info")
     (build-system dune-build-system)
+    (properties '())
     (arguments
      '(#:package "dune-build-info"
        ;; No separate test suite from dune.
-- 
2.41.0

[bug#64209] [PATCH v3 02/14] gnu: Add ocaml-pp.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-pp): New variable.

Change-Id: Ic1782f531515802facb7fbcaea35405feffe2dc3
---
 gnu/packages/ocaml.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 2fd2f8e9f9..497588c4ea 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1980,6 +1980,33 @@ (define-public ocaml5.0-csexp
     (propagated-inputs
      `(("ocaml-result" ,ocaml5.0-result)))))
 
+(define-public ocaml-pp
+  (package
+    (name "ocaml-pp")
+    (version "1.1.2")
+    (home-page "https://github.com/ocaml-dune/pp")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url home-page)
+                     (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "0w7gxa85ffbd6jgs6ziarq69yi423f0qkpk05r3abh6lg8smw8pg"))))
+    (build-system dune-build-system)
+    (native-inputs (list ocaml-ppx-expect))
+    (synopsis "Pretty-printing library for ocaml that aims to be easy to use")
+    (description
+     "This library provides a lean alternative to the Format module of the OCaml
+standard library.  It aims to make it easy for users to do the right thing.  If
+you have tried Format before but find its API complicated and difficult to use,
+then Pp might be a good choice for you.  Pp uses the same concepts of boxes and
+break hints, and the final rendering is done to formatter from the Format
+module.  However it defines its own algebra which some might find easier to work
+with and reason about.")
+    (license license:expat)))
+
 (define-public ocaml-migrate-parsetree
   (package
     (name "ocaml-migrate-parsetree")
-- 
2.41.0

[bug#64209] [PATCH v3 03/14] gnu: Add ocamlformat-rpc-lib.

[Benjamin]

* gnu/packages/ocaml.scm (ocamlformat-rpc-lib): New variable.

Change-Id: I960fb7bb4647c1ec1def870d5ec5afe6411347cf
---
 gnu/packages/ocaml.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 497588c4ea..3aeec614ca 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9743,6 +9743,19 @@ (define-public ocamlformat
 a uniform style.")
     (license license:expat)))
 
+(define-public ocamlformat-rpc-lib
+  (package
+    (inherit ocamlformat)
+    (name "ocamlformat-rpc-lib")
+    (arguments
+     '(#:package "ocamlformat-rpc-lib"
+       #:tests? #f))
+    (propagated-inputs (list ocaml-csexp ocaml-odoc))
+    (synopsis "Auto-formatter for OCaml code in RPC mode")
+    (description
+     "OCamlFormat is a tool to automatically format OCaml code in a uniform style.
+This package defines a RPC interface to OCamlFormat.")))
+
 (define-public ocaml-bigstringaf
   (package
     (name "ocaml-bigstringaf")
-- 
2.41.0

[bug#64209] [PATCH v3 04/14] gnu: Add ocaml-ppx-yojson-conv-lib.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-ppx-yojson-conv-lib): New variable.

Change-Id: Iff772e4492ec80071ba99ba473164da9440a1f63
---
 gnu/packages/ocaml.scm | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 3aeec614ca..6cf88e08c0 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6135,7 +6135,30 @@ (define-public ocaml-yojson
 yojson package.  The program @code{atdgen} can be used to derive OCaml-JSON
 serializers and deserializers from type definitions.")
     (license license:bsd-3)))
- 
+
+(define-public ocaml-ppx-yojson-conv-lib
+  (package
+    (name "ocaml-ppx-yojson-conv-lib")
+    (version "0.15.0")
+    (home-page "https://github.com/janestreet/ppx_yojson_conv_lib")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+          (url home-page)
+          (commit (string-append "v" version))))
+        (sha256
+         (base32
+          "0slc5cwy60vx8gskmn20hmndjncpp5zs80a9wm7hxv8yl003i60y"))))
+    (build-system dune-build-system)
+    (propagated-inputs (list ocaml-yojson))
+    (properties `((upstream-name . "ppx_yojson_conv_lib")))
+    (synopsis "Runtime library used by ocaml PPX yojson convertor")
+    (description "Ppx_yojson_conv_lib is the runtime library used by
+ppx_yojson_conv, a ppx rewriter that can be used to convert ocaml types
+to a Yojson.Safe value.")
+    (license license:expat)))
+
 (define-public ocaml-merlin-lib
   (package
     (name "ocaml-merlin-lib")
-- 
2.41.0

[bug#64209] [PATCH v3 05/14] gnu: Add ocaml-ordering.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-ordering): New variable.

Change-Id: I358f4759e050c2d2d24f611a70149bf38e2f1c59
---
 gnu/packages/ocaml.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 6cf88e08c0..1b4bd8685e 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9691,6 +9691,25 @@ (define-public ocaml-dune-build-info
 reporting the version from the version control system during development to
 get an precise reference of when the executable was built.")))
 
+(define-public ocaml-ordering
+  (package
+    (inherit dune)
+    (name "ocaml-ordering")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "ordering"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-odoc))
+    (properties '())
+    (synopsis "Ocaml element ordering library")
+    (description "This library implement element ordering and a convenient
+operator for efficiently chaining multiple comparisons together.")))
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.41.0

[bug#64209] [PATCH v3 06/14] gnu: Add ocaml-dyn.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-dyn): New variable.

Change-Id: I4f35a5e3e9271f70cfd88845964d24257d1d0ddf
---
 gnu/packages/ocaml.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 1b4bd8685e..0cafb8c6ee 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9691,6 +9691,25 @@ (define-public ocaml-dune-build-info
 reporting the version from the version control system during development to
 get an precise reference of when the executable was built.")))
 
+(define-public ocaml-dyn
+  (package
+    (inherit dune)
+    (name "ocaml-dyn")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "dyn"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-ordering ocaml-pp ocaml-odoc))
+    (properties '())
+    (synopsis "Ocaml dynamic type library")
+    (description "Representation of OCaml values such that they can be
+processed without knowing their type.")))
+
 (define-public ocaml-ordering
   (package
     (inherit dune)
-- 
2.41.0

[bug#64209] [PATCH v3 07/14] gnu: Add ocaml-stdune.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-stdune): New variable.

Change-Id: Iac602da6a41ed99264c9a20fac989d43e2e9ed0d
---
 gnu/packages/ocaml.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 0cafb8c6ee..a97ae57b56 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9710,6 +9710,27 @@ (define-public ocaml-dyn
     (description "Representation of OCaml values such that they can be
 processed without knowing their type.")))
 
+(define-public ocaml-stdune
+  (package
+    (inherit dune)
+    (name "ocaml-stdune")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "stdune"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-dyn ocaml-ordering ocaml-pp ocaml-csexp
+                             ocaml-odoc))
+    (properties '())
+    (synopsis "Ocaml Dune's unstable standard library")
+    (description
+     "This library is dune standard library. It offers no backwards
+compatibility guarantees.")))
+
 (define-public ocaml-ordering
   (package
     (inherit dune)
-- 
2.41.0

[bug#64209] [PATCH v3 08/14] gnu: Add ocaml-chrome-trace.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-chrome-trace): New variable.

Change-Id: I3c761ff694a0be32171df0fa3f57c6930b9c5438
---
 gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index a97ae57b56..76cc995753 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9691,6 +9691,28 @@ (define-public ocaml-dune-build-info
 reporting the version from the version control system during development to
 get an precise reference of when the executable was built.")))
 
+(define-public ocaml-chrome-trace
+  (package
+    (inherit dune)
+    (name "ocaml-chrome-trace")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "chrome-trace"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-odoc))
+    (properties '())
+    (synopsis "Chrome trace event generation library for ocaml")
+    (description
+     "Output trace data to a file in Chrome's trace_event format. This format is
+    compatible with chrome trace viewer chrome://tracing.
+    This library offers no backwards compatibility guarantees.")
+    (license license:expat)))
+
 (define-public ocaml-dyn
   (package
     (inherit dune)
-- 
2.41.0

[bug#64209] [PATCH v3 09/14] gnu: Add ocaml-xdg.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-xdg): New variable.

Change-Id: Ie4246d9e655fafd60e650ac8043bdc6d51bcb737
---
 gnu/packages/ocaml.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 76cc995753..a12e7f4264 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9753,6 +9753,26 @@ (define-public ocaml-stdune
      "This library is dune standard library. It offers no backwards
 compatibility guarantees.")))
 
+(define-public ocaml-xdg
+  (package
+    (inherit dune)
+    (name "ocaml-xdg")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "xdg"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-odoc))
+    (properties '())
+    (synopsis "XDG Base Directory Specification library for ocaml")
+    (description
+     "This ocaml library returns user XDG directories such as XDG_CONFIG_HOME,
+     XDG_STATE_HOME.")))
+
 (define-public ocaml-ordering
   (package
     (inherit dune)
-- 
2.41.0

[bug#64209] [PATCH v3 10/14] gnu: Add ocamlc-loc.

[Benjamin]

* gnu/packages/ocaml.scm (ocamlc-loc): New variable.

Change-Id: I6f07101aa27eb5879ab8c33a72e4278ba09b6b92
---
 gnu/packages/ocaml.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index a12e7f4264..2af4f4133f 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9792,6 +9792,26 @@ (define-public ocaml-ordering
     (description "This library implement element ordering and a convenient
 operator for efficiently chaining multiple comparisons together.")))
 
+(define-public ocamlc-loc
+  (package
+    (inherit dune)
+    (name "ocamlc-loc")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "ocamlc-loc"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-dyn ocaml-odoc))
+    (properties '())
+    (synopsis "Parse ocaml compiler output into structured form")
+    (description
+     "This library parses ocaml complier output and returns it as ocaml values.
+This library offers no backwards compatibility guarantees.")))
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.41.0

[bug#64209] [PATCH v3 11/14] gnu: Add ocaml-fiber.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-fiber): New variable.

Change-Id: I712cc3d907915fe9e1a0d3ff9e02bd6514130645
---
 gnu/packages/ocaml.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 2af4f4133f..733bcd011e 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9753,6 +9753,26 @@ (define-public ocaml-stdune
      "This library is dune standard library. It offers no backwards
 compatibility guarantees.")))
 
+(define-public ocaml-fiber
+  (package
+    (inherit dune)
+    (name "ocaml-fiber")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "fiber"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-stdune ocaml-dyn ocaml-odoc))
+    (properties '())
+    (synopsis "Structured concurrency library for ocaml")
+    (description
+     "This library implements structured concurrency for ocaml.
+     It offers no backwards compatibility guarantees.")))
+
 (define-public ocaml-xdg
   (package
     (inherit dune)
-- 
2.41.0

[bug#64209] [PATCH v3 12/14] gnu: Add ocaml-dune-rpc.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-dune-rpc): New variable.

Change-Id: Iccdb76ffa3ca7a896de9f349939df77dfaca35f8
---
 gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 733bcd011e..e96beeed56 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -9691,6 +9691,30 @@ (define-public ocaml-dune-build-info
 reporting the version from the version control system during development to
 get an precise reference of when the executable was built.")))
 
+(define-public ocaml-dune-rpc
+  (package
+    (inherit dune)
+    (name "ocaml-dune-rpc")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "dune-rpc"
+       #:tests? #f
+       #:phases (modify-phases %standard-phases
+                  (add-before 'build 'remove-vendor
+                    (lambda _
+                      (delete-file-recursively "vendor/csexp")
+                      (delete-file-recursively "vendor/pp"))))))
+    (propagated-inputs (list ocaml-csexp
+                             ocaml-ordering
+                             ocaml-dyn
+                             ocaml-xdg
+                             ocaml-stdune
+                             ocaml-pp
+                             ocaml-odoc))
+    (properties '())
+    (synopsis "Communicate with ocaml dune using rpc")
+    (description "Library to connect and control a running dune instance.")))
+
 (define-public ocaml-chrome-trace
   (package
     (inherit dune)
-- 
2.41.0

[bug#64209] [PATCH v3 13/14] gnu: Add ocaml-merlin-lib-4.9.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-merlin-lib-4.9): New variable.
---
 gnu/packages/ocaml.scm | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index e96beeed56..f9405ae2b9 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6205,6 +6205,23 @@ (define ocaml-merlin-lib-500
 (define-public ocaml5.0-merlin-lib
   (package-with-ocaml5.0 ocaml-merlin-lib-500))
 
+(define-public ocaml-merlin-lib-4.9
+  (package
+    (inherit ocaml-merlin-lib)
+    (name "ocaml-merlin-lib")
+    (version "4.9-500")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ocaml/merlin")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "186rb6cj9a18jhss3pablp48s7pl5xbmx8ih1dxbfh2wa3hvsdsb"))))
+    (properties '())))
+
 (define-public ocaml-dot-merlin-reader
   (package
     (inherit ocaml-merlin-lib)
-- 
2.41.0

[bug#64209] [PATCH v3 14/14] gnu: Add ocaml-lsp-server.

[Benjamin]

* gnu/packages/ocaml.scm (ocaml-lsp-server): New variable.
---
 gnu/packages/ocaml.scm | 43 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index f9405ae2b9..3d2826f0ce 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6298,6 +6298,49 @@ (define-public ocaml5.0-merlin
 Atom.")
      (license license:expat))))
 
+;this package is not public because 1.16.1 only support ocaml 5.0 and 5.1
+(define ocaml-lsp-server
+  (package
+    (name "ocaml-lsp-server")
+    (version "1.16.2")
+    (home-page "https://github.com/ocaml/ocaml-lsp")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                (url home-page)
+                (commit version)))
+              (sha256
+               (base32
+                "1nd1655allyml2qpr6asxv3d2pdq5clw7vx7zx9bfiawyi2szsn8"))))
+    (build-system dune-build-system)
+    (arguments '(#:tests? #f)) ; tests are failing for v1.16.1
+    (propagated-inputs (list ocaml-merlin-lib-4.9
+                             ocamlformat-rpc-lib
+                             ocaml-pp
+                             ocamlc-loc
+                             ocaml-spawn
+                             ocaml-ordering
+                             ocaml-fiber
+                             ocaml-dyn
+                             ocaml-dune-rpc
+                             ocaml-re
+                             ocaml-csexp
+                             ocaml-uutf
+                             ocaml-odoc-parser
+                             ocaml-dune-build-info
+                             ocaml-xdg
+                             ocaml-stdune
+                             ocaml-chrome-trace
+                             ocaml-ppx-yojson-conv-lib
+                             ocaml-yojson))
+    (native-inputs (list ocaml-ppx-expect ocamlformat ocaml-odoc))
+    (properties `((upstream-name . "ocaml-lsp-server")))
+    (synopsis "LSP Server for OCaml")
+    (description "This package implements an Ocaml language server implementation.")
+    (license license:isc)))
+
+(define-public ocaml5.0-lsp-server (package-with-ocaml5.0 ocaml-lsp-server))
+
 (define-public ocaml-gsl
   (package
     (name "ocaml-gsl")
-- 
2.41.0

[bug#64209] [PATCH v4 00/11] Update with rebase on master

[Benjamin via Guix-patches via]

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

[bug#64209] [PATCH v4 01/11] gnu: Fix dune-ordering

[Benjamin via Guix-patches via]

* gnu/packages/ocaml.scm (dune-ordering): fix dune-ordering to make
  it, and its inherited packages compatible with package-with-ocaml5.0

Change-Id: I07dc1e9fe32903a019da846cd6e40333619a3f36
---
 gnu/packages/ocaml.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 0f4c351141..53909fe1e1 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -2092,6 +2092,7 @@ (define-public dune-ordering
      `(#:package "ordering"
        ;; Tests have a cyclic dependency on stdune
        #:tests? #f))
+    (properties '())
     (synopsis "Dune element ordering")
     (description "This library represents element ordering in OCaml.")))
 
-- 
2.41.0

[bug#64209] [PATCH v4 02/11] gnu: Add ocaml-ppx-yojson-conv-lib.

[Benjamin via Guix-patches via]

* gnu/packages/ocaml.scm (ocaml-ppx-yojson-conv-lib): New variable.

Change-Id: Ifd7d64e88dc873bff08ac393779ecc86594455a1
---
 gnu/packages/ocaml.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 53909fe1e1..dc82739643 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6083,6 +6083,29 @@ (define-public ocaml-yojson
 serializers and deserializers from type definitions.")
     (license license:bsd-3)))
 
+(define-public ocaml-ppx-yojson-conv-lib
+  (package
+    (name "ocaml-ppx-yojson-conv-lib")
+    (version "0.16.0")
+    (home-page "https://github.com/janestreet/ppx_yojson_conv_lib")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+          (url home-page)
+          (commit (string-append "v" version))))
+        (sha256
+         (base32
+          "1npc1dbrcl3izi2rpf3rqz98jvsxrgzqn2vb95nf8wxgmh6gmrsc"))))
+    (build-system dune-build-system)
+    (propagated-inputs (list ocaml-yojson))
+    (properties `((upstream-name . "ppx_yojson_conv_lib")))
+    (synopsis "Runtime library used by ocaml PPX yojson convertor")
+    (description "Ppx_yojson_conv_lib is the runtime library used by
+ppx_yojson_conv, a ppx rewriter that can be used to convert ocaml types
+to a Yojson.Safe value.")
+    (license license:expat)))
+
 (define-public ocaml-merlin-lib
   (package
     (name "ocaml-merlin-lib")
-- 
2.41.0

[bug#64209] [PATCH v4 03/11] gnu: Fix ocaml-dune-build-info

[Benjamin via Guix-patches via]

* gnu/packages/ocaml.scm (ocaml-dune-build-info): inherit same way as
other dune packages

Change-Id: I6836bbe6a9860aee8e5fc672e65a1c577690d324
---
 gnu/packages/ocaml.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index dc82739643..7aa4b45374 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -8749,7 +8749,7 @@ (define-public ocaml-fix
 
 (define-public ocaml-dune-build-info
   (package
-    (inherit dune)
+    (inherit dune-ordering)
     (name "ocaml-dune-build-info")
     (build-system dune-build-system)
     (arguments
-- 
2.41.0

[bug#64209] [PATCH v4 04/11] gnu: Add ocaml-xdg.

[Benjamin via Guix-patches via]

* gnu/packages/ocaml.scm (ocaml-xdg): New variable.

Change-Id: I88bc2fd7bb55d721ce1887a727480338dea0590c
---
 gnu/packages/ocaml.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 7aa4b45374..0d77d93a34 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -8765,6 +8765,21 @@ (define-public ocaml-dune-build-info
 reporting the version from the version control system during development to
 get an precise reference of when the executable was built.")))
 
+(define-public ocaml-xdg
+  (package
+    (inherit dune-ordering)
+    (name "ocaml-xdg")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "xdg"
+       ;; Tests have a cyclic dependency on stdune
+       #:tests? #f))
+    (propagated-inputs (list ocaml-odoc))
+    (synopsis "XDG Base Directory Specification library for ocaml")
+    (description
+     "This ocaml library returns user XDG directories such as XDG_CONFIG_HOME,
+     XDG_STATE_HOME.")))
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.41.0

[bug#64209] [PATCH v4 05/11] gnu: Add dune-rpc.

[Benjamin via Guix-patches via]

* gnu/packages/ocaml.scm (dune-rpc): New variable.

Change-Id: Ic6488d3517d9bb4dc5a2e55d93be3ceee2103a3e
---
 gnu/packages/ocaml.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 0d77d93a34..8def4c18aa 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -8780,6 +8780,25 @@ (define-public ocaml-xdg
      "This ocaml library returns user XDG directories such as XDG_CONFIG_HOME,
      XDG_STATE_HOME.")))
 
+(define-public dune-rpc
+  (package
+    (inherit dune-ordering)
+    (name "dune-rpc")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "dune-rpc"
+       ;; Tests have a cyclic dependency on stdune
+       #:tests? #f))
+    (propagated-inputs (list ocaml-csexp
+                             dune-ordering
+                             dune-dyn
+                             ocaml-xdg
+                             dune-stdune
+                             ocaml-pp
+                             ocaml-odoc))
+    (synopsis "Communicate with ocaml dune using rpc")
+    (description "Library to connect and control a running dune instance.")))
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.41.0

[bug#64209] [PATCH v4 06/11] gnu: Add ocamlc-loc.

[Benjamin via Guix-patches via]

* gnu/packages/ocaml.scm (ocamlc-loc): New variable.

Change-Id: I0bcc2666d8030f067b964647400ff31e9302d1c7
---
 gnu/packages/ocaml.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 8def4c18aa..08d4cea003 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -8799,6 +8799,22 @@ (define-public dune-rpc
     (synopsis "Communicate with ocaml dune using rpc")
     (description "Library to connect and control a running dune instance.")))
 
+(define-public ocamlc-loc
+  (package
+    (inherit dune-ordering)
+    (name "ocamlc-loc")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "ocamlc-loc"
+       ;; Tests have a cyclic dependency on stdune
+       #:tests? #f))
+    (propagated-inputs (list dune-dyn ocaml-odoc))
+    (synopsis "Parse ocaml compiler output into structured form")
+    (description
+     "This library parses ocaml complier output and returns it as ocaml values.
+This library offers no backwards compatibility guarantees.")))
+
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.41.0

[bug#64209] [PATCH v4 07/11] gnu: Add ocaml-chrome-trace.

[Benjamin via Guix-patches via]

* gnu/packages/ocaml.scm (ocaml-chrome-trace): New variable.

Change-Id: I24dd519d913ea240c3500b824e2342a33d34ed1a
---
 gnu/packages/ocaml.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 08d4cea003..2975a321a3 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -8814,6 +8814,22 @@ (define-public ocamlc-loc
      "This library parses ocaml complier output and returns it as ocaml values.
 This library offers no backwards compatibility guarantees.")))
 
+(define-public ocaml-chrome-trace
+  (package
+    (inherit dune-ordering)
+    (name "ocaml-chrome-trace")
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "chrome-trace"
+       ;; Tests have a cyclic dependency on stdune
+       #:tests? #f))
+    (propagated-inputs (list ocaml-odoc))
+    (synopsis "Chrome trace event generation library for ocaml")
+    (description
+     "Output trace data to a file in Chrome's trace_event format. This format is
+    compatible with chrome trace viewer chrome://tracing.
+    This library offers no backwards compatibility guarantees.")
+    (license license:expat)))
 
 (define-public ocaml-either
   (package
-- 
2.41.0

[bug#64209] [PATCH v4 08/11] gnu: Add ocaml-fiber.

[Benjamin via Guix-patches via]

* gnu/packages/ocaml.scm (ocaml-fiber): New variable.

Change-Id: Ibfab7cde463c806a89836bc42e3b84720fbf7206
---
 gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 2975a321a3..120fe4eec8 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -8831,6 +8831,31 @@ (define-public ocaml-chrome-trace
     This library offers no backwards compatibility guarantees.")
     (license license:expat)))
 
+(define-public ocaml-fiber
+  (package
+    (name "ocaml-fiber")
+    (home-page "https://github.com/ocaml-dune/fiber")
+    (version "3.7.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url home-page)
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "085v1dfxrb4wnkgysghj5q4vr4nx3nxr84rqmy874dr3pk30740n"))))
+    (build-system dune-build-system)
+    (arguments
+     '(#:package "fiber"))
+    (propagated-inputs (list dune-stdune dune-dyn))
+    (native-inputs (list ocaml-odoc ocaml-ppx-expect))
+    (synopsis "Structured concurrency library")
+    (description
+     "This library implements structured concurrency for ocaml.
+     It offers no backwards compatibility guarantees.")
+    (license license:expat)))
+
 (define-public ocaml-either
   (package
     (name "ocaml-either")
-- 
2.41.0

[bug#64209] [PATCH v4 09/11] gnu: Add ocamlformat-rpc-lib.

[Benjamin via Guix-patches via]

* gnu/packages/ocaml.scm (ocamlformat-rpc-lib): New variable.

Change-Id: If936fc70e541c5bf93bb021d8cc9f770b2d5329d
---
 gnu/packages/ocaml.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 120fe4eec8..953b563563 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -8931,6 +8931,18 @@ (define-public ocamlformat
 a uniform style.")
     (license license:expat)))
 
+(define-public ocamlformat-rpc-lib
+  (package
+    (inherit ocamlformat)
+    (name "ocamlformat-rpc-lib")
+    (arguments
+     '(#:package "ocamlformat-rpc-lib"))
+    (propagated-inputs (list ocaml-csexp ocaml-odoc))
+    (synopsis "Auto-formatter for OCaml code in RPC mode")
+    (description
+     "OCamlFormat is a tool to automatically format OCaml code in a uniform style.
+This package defines a RPC interface to OCamlFormat.")))
+
 (define-public ocaml-bigstringaf
   (package
     (name "ocaml-bigstringaf")
-- 
2.41.0

[bug#64209] [PATCH v4 10/11] gnu: ocaml-merlin-lib: Update to 4.14.

[Benjamin via Guix-patches via]

* gnu/packages/ocaml.scm (ocaml-merlin-lib): Update to 4.14-414.
* gnu/packages/ocaml.scm (ocaml-merlin-lib-500): Update to 4.14-500.

Change-Id: I5b2117f34eca6d55b95413a7fefc29c4acdee7e5
---
 gnu/packages/ocaml.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 953b563563..bb7fd3a2de 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6109,7 +6109,7 @@ (define-public ocaml-ppx-yojson-conv-lib
 (define-public ocaml-merlin-lib
   (package
     (name "ocaml-merlin-lib")
-    (version "4.7-414")
+    (version "4.14-414")
     (source
      (origin
        (method git-fetch)
@@ -6119,7 +6119,7 @@ (define-public ocaml-merlin-lib
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "1bd4j2zq0lyszbkibgky1z9swv4scb7ljww3fv1kqy0cya743b5l"))))
+         "1d9q6yl5i08j9lkmbywh5q1yfjxin5n9yp9bqwi7a9lanhwg8psi"))))
     (build-system dune-build-system)
     (arguments '(#:package "merlin-lib"
                  #:tests? #f))          ; no tests
@@ -6136,7 +6136,7 @@ (define ocaml-merlin-lib-500
   (package
     (inherit ocaml-merlin-lib)
     (name "ocaml-merlin-lib")
-    (version "4.7.1-500")
+    (version "4.14-500")
     (source
      (origin
        (method git-fetch)
@@ -6146,7 +6146,7 @@ (define ocaml-merlin-lib-500
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01"))))
+         "0rx0h8a7m435jmfvpxjf4682dxgb2f74ar1k1m3c3hls6yxgw0a9"))))
     (properties '())))
 
 (define-public ocaml5.0-merlin-lib
-- 
2.41.0

[bug#64209] [PATCH v4 11/11] gnu: Add ocaml-lsp-server.

[Benjamin via Guix-patches via]

* gnu/packages/ocaml.scm (ocaml-lsp-server): New variable.

Change-Id: Ib861dea3d7d00d570f253ffc3b4955e547dc2676
---
 gnu/packages/ocaml.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index bb7fd3a2de..cefb3384b5 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -6228,6 +6228,48 @@ (define-public ocaml5.0-merlin
 Atom.")
      (license license:expat))))
 
+(define-public ocaml-lsp-server
+  (package
+    (name "ocaml-lsp-server")
+    (version "1.17.0")
+    (home-page "https://github.com/ocaml/ocaml-lsp")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                (url home-page)
+                (commit version)))
+              (sha256
+               (base32
+                "1w1m2mi7va3wcwgvgzqd3af6hrhx5zzyr3hqa228pcimp44w6f0h"))))
+    (build-system dune-build-system)
+    (arguments '(#:tests? #f)) ; tests are failing for v1.17
+    (propagated-inputs (list
+                             ocaml-re
+                             ocaml-ppx-yojson-conv-lib
+                             dune-rpc
+                             ocaml-chrome-trace
+                             dune-dyn
+                             dune-stdune
+                             ocaml-fiber
+                             ocaml-xdg
+                             dune-ordering
+                             ocaml-dune-build-info
+                             ocaml-spawn
+                             ocamlc-loc
+                             ocaml-uutf
+                             ocaml-pp
+                             ocaml-csexp
+                             ocamlformat-rpc-lib
+                             ocaml-odoc
+                             ocaml-merlin-lib))
+    (native-inputs (list ocaml-ppx-expect ocamlformat))
+    (properties `((upstream-name . "ocaml-lsp-server")))
+    (synopsis "LSP Server for OCaml")
+    (description "This package implements an Ocaml language server implementation.")
+    (license license:isc)))
+
+(define-public ocaml5.0-lsp-server (package-with-ocaml5.0 ocaml-lsp-server))
+
 (define-public ocaml-gsl
   (package
     (name "ocaml-gsl")
-- 
2.41.0