guix_mirror_bot pushed a commit to branch ocaml-team
in repository guix.
commit 5e5fb4928b661b1445784d5830955f1a32f27e01
Author: Jason Conroy <[email protected]>
AuthorDate: Sun Dec 21 11:49:26 2025 -0500
gnu: ocaml: Move ocaml5.3-csexp to module `ocaml5`.
* gnu/packages/ocaml.scm (ocaml5.3-csexp): Delete variable.
* gnu/packages/ocaml5.scm (ocaml5.3-csexp): New variable.
Change-Id: Iaccfcbb6a3b238d053d9c47f1be918b66ce3f73b
Signed-off-by: Julien Lepiller <[email protected]>
---
gnu/packages/ocaml.scm | 16 ++--------------
gnu/packages/ocaml5.scm | 41 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 4945471d3f..e446174f93 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -2006,7 +2006,7 @@ config.h files for instance. Among other things,
dune-configurator allows one t
#:dune ,ocaml5:ocaml5.3-dune-bootstrap
#:ocaml ,ocaml5:ocaml-5.3
#:findlib ,ocaml5:ocaml5.3-findlib))
- (propagated-inputs (list ocaml5.3-csexp))))
+ (propagated-inputs (list ocaml5:ocaml5.3-csexp))))
(define-public dune
(package
@@ -2176,7 +2176,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.3-csexp))))
+ (ocaml5.3-variant . ,(delay ocaml5:ocaml5.3-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
@@ -2217,18 +2217,6 @@ module of this library is parameterised by the type of
S-expressions.")
(propagated-inputs
`(("ocaml-result" ,ocaml5.0-result)))))
-(define-public ocaml5.3-csexp
- (package
- (inherit ocaml-csexp)
- (name "ocaml5.3-csexp")
- (arguments
- `(#:ocaml ,ocaml5:ocaml-5.3
- #:findlib ,ocaml5:ocaml5.3-findlib
- ,@(substitute-keyword-arguments (package-arguments ocaml-csexp)
- ((#:dune _) ocaml5:ocaml5.3-dune-bootstrap))))
- (propagated-inputs
- `(("ocaml-result" ,ocaml5:ocaml5.3-result)))))
-
(define-public ocaml-migrate-parsetree
(package
(name "ocaml-migrate-parsetree")
diff --git a/gnu/packages/ocaml5.scm b/gnu/packages/ocaml5.scm
index 9d47152a75..43dc151ec9 100644
--- a/gnu/packages/ocaml5.scm
+++ b/gnu/packages/ocaml5.scm
@@ -207,6 +207,47 @@ Descriptions of projects, libraries and executables are
provided in
(properties '((hidden? . #t)))
(license license:expat)))
+(define-public ocaml5.3-csexp
+ (package
+ (name "ocaml5.3-csexp")
+ (version "1.5.2")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ocaml-dune/csexp";)
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0p3ajswxwc43cvpbmi7c897jhp9z7nlys1qic960cwgpgvfa95d4"))))
+ (build-system dune-build-system)
+ (arguments
+ `(#:tests? #f ;FIXME: needs ppx_expect, but which version?
+ #:dune ,ocaml5.3-dune-bootstrap
+ #:phases (modify-phases %standard-phases
+ (add-before 'build 'chmod
+ (lambda _
+ (for-each (lambda (file)
+ (chmod file #o644))
+ (find-files "." ".*")) #t)))))
+ (propagated-inputs (list ocaml5.3-result))
+ (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
+S-expressions. Canonical S-expressions are a binary encoding of
+S-expressions that is super simple and well suited for communication
+between programs.
+
+This library only provides a few helpers for simple applications. If
+you need more advanced support, such as parsing from more fancy input
+sources, you should consider copying the code of this library given
+how simple parsing S-expressions in canonical form is.
+
+To avoid a dependency on a particular S-expression library, the only
+module of this library is parameterised by the type of S-expressions.")
+ (license license:expat)))
+
(define-public ocaml5.3-findlib
(package
(name "ocaml5.3-findlib")
