gnu: ocaml5: ocaml-5.3: Delete variable.

* gnu/packages/ocaml5.scm (ocaml-5.3): Delete variable. Change-Id: Id78b07917692518e1afd48041b69871ecbae58c2 Signed-off-by: Julien Lepiller <julien@lepiller.eu>
gnu: ocaml5: Update default compiler to 5.4.1 and update dependees broken by change. [security-fixes]
2026-05-17 18:45:38 +02:00 · 2026-05-17 18:45:26 +02:00 · 2026-05-17 18:45:10 +02:00 · 2026-05-17 18:45:08 +02:00 · 2026-05-17 18:45:06 +02:00 · 2026-05-17 18:45:04 +02:00
4 changed files with 1557 additions and 220 deletions
@@ -1951,7 +1951,7 @@ Descriptions of projects, libraries and executables are provided in
     (list ocaml-csexp))
    (properties `((ocaml4.09-variant . ,(delay ocaml4.09-dune-configurator))
                  (ocaml5.0-variant . ,(delay ocaml5.0-dune-configurator))
-                  (ocaml5.3-variant . ,(delay ocaml5:ocaml5.3-dune-configurator))))
+                  (ocaml5.4-variant . ,(delay ocaml5:ocaml5.4-dune-configurator))))
    (synopsis "Dune helper library for gathering system configuration")
    (description "Dune-configurator is a small library that helps writing
 OCaml scripts that test features available on the system, in order to generate
@@ -1995,7 +1995,7 @@ config.h files for instance.  Among other things, dune-configurator allows one t
    (properties `((ocaml4.07-variant . ,(delay ocaml4.07-dune))
                  (ocaml4.09-variant . ,(delay ocaml4.09-dune))
                  (ocaml5.0-variant . ,(delay ocaml5.0-dune))
-                  (ocaml5.3-variant . ,(delay ocaml5:ocaml5.3-dune))))))
+                  (ocaml5.4-variant . ,(delay ocaml5:ocaml5.4-dune))))))

 (define-public ocaml4.09-dune
  (package
@@ -2149,7 +2149,7 @@ executables and libraries")))
     (list ocaml-result))
    (properties `((ocaml4.09-variant . ,(delay ocaml4.09-csexp))
                  (ocaml5.0-variant . ,(delay ocaml5.0-csexp))
-                  (ocaml5.3-variant . ,(delay ocaml5:ocaml5.3-csexp))))
+                  (ocaml5.4-variant . ,(delay ocaml5:ocaml5.4-csexp))))
    (home-page "https://github.com/ocaml-dune/csexp")
    (synopsis "Parsing and printing of S-expressions in Canonical form")
    (description "This library provides minimal support for Canonical
@@ -2310,7 +2310,7 @@ bitsrings in Erlang style as primitives to the language.")))
     `(#:dune ,dune-bootstrap))
    (properties `((ocaml4.09-variant . ,(delay ocaml4.09-result))
                  (ocaml5.0-variant . ,(delay ocaml5.0-result))
-                  (ocaml5.3-variant . ,(delay ocaml5:ocaml5.3-result))))
+                  (ocaml5.4-variant . ,(delay ocaml5:ocaml5.4-result))))
    (home-page "https://github.com/janestreet/result")
    (synopsis "Compatibility Result module")
    (description "Uses the new result type defined in OCaml >= 4.03 while
@@ -6134,23 +6134,10 @@ interfaces and the standard higher-level merlin protocol.")
    (arguments '(#:package "dot-merlin-reader"
                 #:tests? #f))          ; no tests
    (propagated-inputs (list ocaml-merlin-lib))
-    (properties `((ocaml5.0-variant . ,(delay ocaml5.0-dot-merlin-reader))))
    (synopsis "Reads config files for @code{ocaml-merlin}")
    (description "@code{ocaml-dot-merlin-reader} is an external reader for
@code{ocaml-merlin} configurations.")))

-(define-public ocaml5.0-dot-merlin-reader
-  (package-with-ocaml5.0
-   (package
-     (inherit ocaml-merlin-lib-500)
-     (name "ocaml-dot-merlin-reader")
-     (arguments '(#:package "dot-merlin-reader"
-                  #:tests? #f))         ; no tests
-     (propagated-inputs (list ocaml5.0-merlin-lib))
-     (synopsis "Reads config files for @code{ocaml-merlin}")
-     (description "@code{ocaml-dot-merlin-reader} is an external reader for
-@code{ocaml-merlin} configurations."))))
-
 (define-public ocaml-merlin
  (package
    (inherit ocaml-dot-merlin-reader)
@@ -6166,7 +6153,6 @@ interfaces and the standard higher-level merlin protocol.")
             (when tests?
               (invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader")))))))
    (propagated-inputs (list ocaml-merlin-lib ocaml-yojson))
-    (properties `((ocaml5.0-variant . ,(delay ocaml5.0-merlin))))
    (native-inputs
     (list ocaml-dot-merlin-reader ; required for tests
           ocaml-ppxlib
@@ -6179,34 +6165,6 @@ External contributors added support for Visual Studio Code, Sublime Text and
 Atom.")
    (license license:expat)))

-(define-public ocaml5.0-merlin
-  (package-with-ocaml5.0
-   (package
-     (inherit ocaml-merlin-lib-500)
-     (name "ocaml-merlin")
-     (arguments
-      '(#:package "merlin"
-        #:phases
-        (modify-phases %standard-phases
-          (replace 'check
-            (lambda* (#:key tests? #:allow-other-keys)
-              ;; Tests require a writable cache directory
-              (setenv "HOME" "/tmp")
-              (when tests?
-                (invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader")))))))
-     (propagated-inputs (list ocaml-merlin-lib ocaml-yojson))
-     (native-inputs
-      (list ocaml-dot-merlin-reader     ; required for tests
-            ocaml-ppxlib
-            ocaml-mdx
-            jq))
-     (synopsis "Context sensitive completion for OCaml in Vim and Emacs")
-     (description "Merlin is an editor service that provides modern IDE
-features for OCaml.  Emacs and Vim support is provided out-of-the-box.
-External contributors added support for Visual Studio Code, Sublime Text and
-Atom.")
-     (license license:expat))))
-
 (define-public ocaml-lsp-server
  (package
    (name "ocaml-lsp-server")
@@ -6247,8 +6205,6 @@ Atom.")
    (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")
@@ -34,8 +34,8 @@
            strip-ocaml4.09-variant
            package-with-ocaml5.0
            strip-ocaml5.0-variant
-            package-with-ocaml5.3
-            strip-ocaml5.3-variant
+            package-with-ocaml5.4
+            strip-ocaml5.4-variant
            default-findlib
            default-ocaml
            default-dune
@@ -130,22 +130,22 @@
 (define (default-ocaml5.0-dune)
  (@* (gnu packages ocaml) ocaml5.0-dune))

-(define (default-ocaml5.3)
-  (@* (gnu packages ocaml5) ocaml-5.3))
+(define (default-ocaml5.4)
+  (@* (gnu packages ocaml5) ocaml-5.4))

-(define (default-ocaml5.3-findlib)
-  (@* (gnu packages ocaml5) ocaml5.3-findlib))
+(define (default-ocaml5.4-findlib)
+  (@* (gnu packages ocaml5) ocaml5.4-findlib))

-(define (default-ocaml5.3-dune)
-  (@* (gnu packages ocaml5) ocaml5.3-dune))
+(define (default-ocaml5.4-dune)
+  (@* (gnu packages ocaml5) ocaml5.4-dune))

 ;; The default versions of core packages within the 5.x series.

-(define default-ocaml5 default-ocaml5.3)
+(define default-ocaml5 default-ocaml5.4)

-(define default-ocaml5-findlib default-ocaml5.3-findlib)
+(define default-ocaml5-findlib default-ocaml5.4-findlib)

-(define default-ocaml5-dune default-ocaml5.3-dune)
+(define default-ocaml5-dune default-ocaml5.4-dune)

 (define* (package-with-explicit-ocaml ocaml findlib dune old-prefix new-prefix
                                       #:key variant-property)
@@ -251,18 +251,18 @@ pre-defined variants."
    (inherit p)
    (properties (alist-delete 'ocaml5.0-variant (package-properties p)))))

-(define package-with-ocaml5.3
-  (package-with-explicit-ocaml (delay (default-ocaml5.3))
-                               (delay (default-ocaml5.3-findlib))
-                               (delay (default-ocaml5.3-dune))
-                               "ocaml-" "ocaml5.3-"
-                               #:variant-property 'ocaml5.3-variant))
+(define package-with-ocaml5.4
+  (package-with-explicit-ocaml (delay (default-ocaml5.4))
+                               (delay (default-ocaml5.4-findlib))
+                               (delay (default-ocaml5.4-dune))
+                               "ocaml-" "ocaml5.4-"
+                               #:variant-property 'ocaml5.4-variant))

-(define (strip-ocaml5.3-variant p)
-  "Remove the 'ocaml5.3-variant' property from P."
+(define (strip-ocaml5.4-variant p)
+  "Remove the 'ocaml5.4-variant' property from P."
  (package
    (inherit p)
-    (properties (alist-delete 'ocaml5.3-variant (package-properties p)))))
+    (properties (alist-delete 'ocaml5.4-variant (package-properties p)))))

 (define (make-lower default-ocaml default-findlib)
  (lambda* (name
@@ -95,19 +95,13 @@
             (string-append "-" install-target) build-flags))
     ((file-exists? "Makefile")
      (apply invoke "make" install-target make-flags))
-     ;; Use either opam-installer or opaline, which both understand
-     ;; opam's `.install` file format.  opam-installer is the standard
-     ;; platform tool, while opaline is a fallback for packages with
-     ;; circular dependencies involving opam.
-     ;; (https://codeberg.org/guix/guix/issues/3588)
+     ;; If there's no Makefile, look for an `.install` file that can be
+     ;; processed by opam-installer.
     ((which "opam-installer")
      (invoke "opam-installer" "-i" (string-append "--prefix=" out)
              (string-append "--libdir=" out "/lib/ocaml/site-lib")))
-     ((which "opaline")
-      (invoke "opaline" "-prefix" out
-              "-libdir" (string-append out "/lib/ocaml/site-lib")))
-     (else (error (string-append "Either 'opam-installer' or 'opaline' "
-                                 "must exist in $PATH at build time.")))))
+     (else (error
+            "'opam-installer' must exist in $PATH at build time."))))
  #t)

 (define* (prepare-install #:key outputs #:allow-other-keys)