guix_mirror_bot pushed a commit to branch ocaml-team
in repository guix.
commit 82343d0ff3411e5b0259a3e30923227bf218a03d
Author: Jason Conroy <[email protected]>
AuthorDate: Sun Dec 21 12:10:53 2025 -0500
gnu: ocaml: Move ocaml5.0-findlib to module `ocaml5`.
* gnu/packages/ocaml.scm (ocaml5.0-findlib): Delete variable.
* gnu/packages/ocaml5.scm (ocaml5.0-findlib): New variables.
* guix/build-system/ocaml.scm (default-ocaml5.0-findlib): Update package
reference.
Change-Id: Idb58f33850f960cfa1ad49a3f897ad17e0383e93
Signed-off-by: Julien Lepiller <[email protected]>
---
gnu/packages/ocaml.scm | 13 +++----------
gnu/packages/ocaml5.scm | 6 ++++++
guix/build-system/ocaml.scm | 2 +-
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 6a86888677..ff802edcc9 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1598,13 +1598,6 @@ compilers that can directly deal with packages.")
(native-inputs
(list m4 ocaml-4.09))))
-(define-public ocaml5.0-findlib
- (package
- (inherit ocaml-findlib)
- (name "ocaml5.0-findlib")
- (native-inputs
- (list m4 ocaml5:ocaml-5.0))))
-
(define-public ocaml-ounit2
(package
(name "ocaml-ounit2")
@@ -1994,7 +1987,7 @@ config.h files for instance. Among other things,
dune-configurator allows one t
`(,@(package-arguments dune-configurator)
#:dune ,ocaml5.0-dune-bootstrap
#:ocaml ,ocaml5:ocaml-5.0
- #:findlib ,ocaml5.0-findlib))
+ #:findlib ,ocaml5:ocaml5.0-findlib))
(propagated-inputs (list ocaml5.0-csexp))))
(define-public dune
@@ -2194,7 +2187,7 @@ module of this library is parameterised by the type of
S-expressions.")
(name "ocaml5.0-csexp")
(arguments
`(#:ocaml ,ocaml5:ocaml-5.0
- #:findlib ,ocaml5.0-findlib
+ #:findlib ,ocaml5:ocaml5.0-findlib
,@(substitute-keyword-arguments (package-arguments ocaml-csexp)
((#:dune _) ocaml5.0-dune-bootstrap))))
(propagated-inputs
@@ -2344,7 +2337,7 @@ defined in this library.")
(arguments
`(#:dune ,ocaml5.0-dune-bootstrap
#:ocaml ,ocaml5:ocaml-5.0
- #:findlib ,ocaml5.0-findlib))))
+ #:findlib ,ocaml5:ocaml5.0-findlib))))
(define-public ocaml-iso8601
(package
diff --git a/gnu/packages/ocaml5.scm b/gnu/packages/ocaml5.scm
index e8a79c9d6b..a87f33e740 100644
--- a/gnu/packages/ocaml5.scm
+++ b/gnu/packages/ocaml5.scm
@@ -339,6 +339,12 @@ compilation and linkage, there are new frontends of the
various OCaml
compilers that can directly deal with packages.")
(license license:x11)))
+(define-public ocaml5.0-findlib
+ (package
+ (inherit ocaml5.3-findlib)
+ (name "ocaml5.0-findlib")
+ (native-inputs
+ (list m4 ocaml-5.0))))
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm
index 4f14984751..88b3f6bf9e 100644
--- a/guix/build-system/ocaml.scm
+++ b/guix/build-system/ocaml.scm
@@ -125,7 +125,7 @@
(@* (gnu packages ocaml5) ocaml-5.0))
(define (default-ocaml5.0-findlib)
- (@* (gnu packages ocaml) ocaml5.0-findlib))
+ (@* (gnu packages ocaml5) ocaml5.0-findlib))
(define (default-ocaml5.0-dune)
(@* (gnu packages ocaml) ocaml5.0-dune))
