guix_mirror_bot pushed a commit to branch ocaml-team
in repository guix.
commit 8a732929621f9e1a74fc5a417448e19aab750f7c
Author: Jason Conroy <[email protected]>
AuthorDate: Sun Dec 21 12:00:09 2025 -0500
gnu: ocaml: Move ocaml5.3-dune to module `ocaml5`.
* gnu/packages/ocaml.scm (ocaml5.3-dune): Delete variable.
* gnu/packages/ocaml5.scm (ocaml5.3-dune): New variable.
* guix/build-system/ocaml.scm (default-ocaml5.3-dune): Update package
reference.
Change-Id: I3f3e453e15638e36afbe7fd7bd920bc5fa328d06
Signed-off-by: Julien Lepiller <[email protected]>
---
gnu/packages/ocaml.scm | 8 +-------
gnu/packages/ocaml5.scm | 6 ++++++
guix/build-system/ocaml.scm | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 91055926cf..6a86888677 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -2005,7 +2005,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.3-dune))))))
+ (ocaml5.3-variant . ,(delay ocaml5:ocaml5.3-dune))))))
(define-public ocaml4.09-dune
(package
@@ -2033,12 +2033,6 @@ config.h files for instance. Among other things,
dune-configurator allows one t
(propagated-inputs
(list ocaml5.0-dune-configurator))))
-(define-public ocaml5.3-dune
- (package
- (inherit ocaml5:ocaml5.3-dune-bootstrap)
- (propagated-inputs
- (list ocaml5:ocaml5.3-dune-configurator))))
-
(define-public ocaml-pp
(package
(name "ocaml-pp")
diff --git a/gnu/packages/ocaml5.scm b/gnu/packages/ocaml5.scm
index 6f2c7c554b..e8a79c9d6b 100644
--- a/gnu/packages/ocaml5.scm
+++ b/gnu/packages/ocaml5.scm
@@ -279,6 +279,12 @@ config.h files for instance. Among other things,
dune-configurator allows one t
@item generate config.h file
@end itemize")))
+(define-public ocaml5.3-dune
+ (package
+ (inherit ocaml5.3-dune-bootstrap)
+ (propagated-inputs (list ocaml5.3-dune-configurator))
+ (properties '())))
+
(define-public ocaml5.3-findlib
(package
(name "ocaml5.3-findlib")
diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm
index 45bae9baee..4f14984751 100644
--- a/guix/build-system/ocaml.scm
+++ b/guix/build-system/ocaml.scm
@@ -137,7 +137,7 @@
(@* (gnu packages ocaml5) ocaml5.3-findlib))
(define (default-ocaml5.3-dune)
- (@* (gnu packages ocaml) ocaml5.3-dune))
+ (@* (gnu packages ocaml5) ocaml5.3-dune))
;; The default versions of core packages within the 5.x series.
