bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 03:55:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ocaml: Move ocaml5.3-result to module ocaml5.

Browse source 
* gnu/packages/ocaml.scm (ocaml5.3-result): Delete variable.
* gnu/packages/ocaml5.scm (ocaml5.3-result): New variable.

Change-Id: If63a977367a963ca6a714a4f92a0847086aa5516
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
This commit is contained in:
Jason Conroy 2025-12-21 11:44:14 -05:00 • committed by Julien Lepiller
parent 388a85e5cb
commit 818ae83b3a
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
2 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gnu/packages/ocaml.scm
View file

@ -2227,7 +2227,7 @@ module of this library is parameterised by the type of S-expressions.")
,@(substitute-keyword-arguments (package-arguments ocaml-csexp)
((#:dune _) ocaml5:ocaml5.3-dune-bootstrap))))
(propagated-inputs
`(("ocaml-result" ,ocaml5.3-result)))))
`(("ocaml-result" ,ocaml5:ocaml5.3-result)))))
(define-public ocaml-migrate-parsetree
(package
@ -2349,7 +2349,7 @@ bitsrings in Erlang style as primitives to the language.")))
`(#:dune ,dune-bootstrap))
(properties `((ocaml4.09-variant . ,(delay ocaml4.09-result))
(ocaml5.0-variant . ,(delay ocaml5.0-result))
(ocaml5.3-variant . ,(delay ocaml5.3-result))))
(ocaml5.3-variant . ,(delay ocaml5:ocaml5.3-result))))
(home-page "https://github.com/janestreet/result")
(synopsis "Compatibility Result module")
(description "Uses the new result type defined in OCaml >= 4.03 while
@ -2375,15 +2375,6 @@ defined in this library.")
#:ocaml ,ocaml5:ocaml-5.0
#:findlib ,ocaml5.0-findlib))))
(define-public ocaml5.3-result
(package
(inherit ocaml-result)
(name "ocaml5.3-result")
(arguments
`(#:dune ,ocaml5:ocaml5.3-dune-bootstrap
#:ocaml ,ocaml5:ocaml-5.3
#:findlib ,ocaml5:ocaml5.3-findlib))))
(define-public ocaml-iso8601
(package
(name "ocaml-iso8601")

26
gnu/packages/ocaml5.scm
View file

@ -57,6 +57,8 @@
#:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages xorg)
#:use-module ((guix build-system dune)
#:select ((ocaml5-dune-build-system . dune-build-system)))
#:use-module ((guix build-system ocaml)
#:select ((ocaml5-build-system . ocaml-build-system)))
#:use-module (guix build-system gnu)
@ -145,6 +147,30 @@ functional, imperative and object-oriented styles of programming.")
(base32
"05jhy9zn53v12rn3sg3vllqf5blv1gp7f06803npimc58crxy6rv"))))))
(define-public ocaml5.3-result
(package
(name "ocaml5.3-result")
(version "1.5")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/janestreet/result")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32 "166laj8qk7466sdl037c6cjs4ac571hglw4l5qpyll6df07h6a7q"))))
(build-system dune-build-system)
(arguments
`(#:dune ,ocaml5.3-dune-bootstrap))
(home-page "https://github.com/janestreet/result")
(synopsis "Compatibility Result module")
(description
"Uses the new result type defined in OCaml >= 4.03 while
staying compatible with older version of OCaml should use the Result module
defined in this library.")
(license license:bsd-3)))
(define-public ocaml5.3-dune-bootstrap
(package
(name "ocaml5.3-dune")