guix_mirror_bot pushed a commit to branch ocaml-team
in repository guix.
commit 7e889cfa9a3d66494acc67ffb5f60e2ea80a3309
Author: Jason Conroy <[email protected]>
AuthorDate: Sat Nov 29 06:49:42 2025 -0500
guix: ocaml: Collect aliases for core ocaml packages in one place.
* guix/build-system/ocaml.scm (default-dune): New variable.
* guix/build-system/dune.scm (default-dune): Remove variable.
Change-Id: I6f98fe3699bc700d2b119d19510083f214cc32ba
Signed-off-by: Julien Lepiller <[email protected]>
---
guix/build-system/dune.scm | 9 +--------
guix/build-system/ocaml.scm | 5 +++++
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/guix/build-system/dune.scm b/guix/build-system/dune.scm
index c45f308349..f172f0b9cb 100644
--- a/guix/build-system/dune.scm
+++ b/guix/build-system/dune.scm
@@ -45,16 +45,9 @@
`((guix build dune-build-system)
,@ocaml:%ocaml-build-system-modules))
-(define (default-dune)
- "Return the default OCaml package."
-
- ;; Do not use `@' to avoid introducing circular dependencies.
- (let ((module (resolve-interface '(gnu packages ocaml))))
- (module-ref module 'dune)))
-
(define* (lower name
#:key source inputs native-inputs outputs system target
- (dune (default-dune))
+ (dune (ocaml:default-dune))
(ocaml (ocaml:default-ocaml))
(findlib (ocaml:default-findlib))
#:allow-other-keys
diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm
index 148e82fc71..4cd7dba3d8 100644
--- a/guix/build-system/ocaml.scm
+++ b/guix/build-system/ocaml.scm
@@ -38,6 +38,7 @@
strip-ocaml5.3-variant
default-findlib
default-ocaml
+ default-dune
lower
ocaml-build
ocaml-build-system))
@@ -78,6 +79,10 @@
"Return the default OCaml-findlib package, resolved lazily."
(@* (gnu packages ocaml) ocaml-findlib))
+(define (default-dune)
+ "Return the default Dune package, resolved lazily."
+ (@* (gnu packages ocaml) dune))
+
(define (default-dune-build-system)
"Return the dune-build-system, resolved lazily."
(@* (guix build-system dune) dune-build-system))
