guix_mirror_bot pushed a commit to branch ocaml-team
in repository guix.
commit d5792bcf52a8abd84f4f1d013b2ca196ba26d49a
Author: Jason Conroy <[email protected]>
AuthorDate: Sun Dec 21 10:47:20 2025 -0500
gnu: ocaml: Move [email protected] to module `ocaml5`.
* gnu/packages/ocaml.scm (ocaml-5.3): Delete variable.
* gnu/packages/ocaml5.scm (ocaml-5.3): New variable.
* guix/build-system/ocaml.scm (default-ocaml5.3): Update package reference.
Change-Id: I8fe23536d188fdede4b93907e87341a1d0c0b2ee
Signed-off-by: Julien Lepiller <[email protected]>
---
gnu/packages/ocaml.scm | 22 ++++------------------
gnu/packages/ocaml5.scm | 14 ++++++++++++++
guix/build-system/ocaml.scm | 2 +-
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 9bf77eb878..c613af7077 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -224,20 +224,6 @@ OCaml and can effectively bootstrap OCaml 4.07.
This package produces a native @command{ocamlc} and a bytecode
@command{ocamllex}.")
(license license:expat))))
-(define-public ocaml-5.3
- (package
- (inherit ocaml5:ocaml-5.0)
- (version "5.3.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ocaml/ocaml";)
- (commit version)))
- (file-name (git-file-name "ocaml" version))
- (sha256
- (base32
- "05jhy9zn53v12rn3sg3vllqf5blv1gp7f06803npimc58crxy6rv"))))))
-
(define-public ocaml-4.14
(package
(name "ocaml")
@@ -1624,7 +1610,7 @@ compilers that can directly deal with packages.")
(inherit ocaml-findlib)
(name "ocaml5.3-findlib")
(native-inputs
- (list m4 ocaml-5.3))))
+ (list m4 ocaml5:ocaml-5.3))))
(define-public ocaml-ounit2
(package
@@ -2028,7 +2014,7 @@ config.h files for instance. Among other things,
dune-configurator allows one t
(arguments
`(,@(package-arguments dune-configurator)
#:dune ,ocaml5.3-dune-bootstrap
- #:ocaml ,ocaml-5.3
+ #:ocaml ,ocaml5:ocaml-5.3
#:findlib ,ocaml5.3-findlib))
(propagated-inputs (list ocaml5.3-csexp))))
@@ -2246,7 +2232,7 @@ module of this library is parameterised by the type of
S-expressions.")
(inherit ocaml-csexp)
(name "ocaml5.3-csexp")
(arguments
- `(#:ocaml ,ocaml-5.3
+ `(#:ocaml ,ocaml5:ocaml-5.3
#:findlib ,ocaml5.3-findlib
,@(substitute-keyword-arguments (package-arguments ocaml-csexp)
((#:dune _) ocaml5.3-dune-bootstrap))))
@@ -2405,7 +2391,7 @@ defined in this library.")
(name "ocaml5.3-result")
(arguments
`(#:dune ,ocaml5.3-dune-bootstrap
- #:ocaml ,ocaml-5.3
+ #:ocaml ,ocaml5:ocaml-5.3
#:findlib ,ocaml5.3-findlib))))
(define-public ocaml-iso8601
diff --git a/gnu/packages/ocaml5.scm b/gnu/packages/ocaml5.scm
index 17a1de7f84..5634f03e78 100644
--- a/gnu/packages/ocaml5.scm
+++ b/gnu/packages/ocaml5.scm
@@ -129,6 +129,20 @@ functional, imperative and object-oriented styles of
programming.")
;; distributed under lgpl2.0.
(license (list license:qpl license:lgpl2.0))))
+(define-public ocaml-5.3
+ (package
+ (inherit ocaml-5.0)
+ (version "5.3.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ocaml/ocaml";)
+ (commit version)))
+ (file-name (git-file-name "ocaml" version))
+ (sha256
+ (base32
+ "05jhy9zn53v12rn3sg3vllqf5blv1gp7f06803npimc58crxy6rv"))))))
+
;;;
;;; 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 92a7e3e916..f709a85b80 100644
--- a/guix/build-system/ocaml.scm
+++ b/guix/build-system/ocaml.scm
@@ -131,7 +131,7 @@
(@* (gnu packages ocaml) ocaml5.0-dune))
(define (default-ocaml5.3)
- (@* (gnu packages ocaml) ocaml-5.3))
+ (@* (gnu packages ocaml5) ocaml-5.3))
(define (default-ocaml5.3-findlib)
(@* (gnu packages ocaml) ocaml5.3-findlib))
