amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

guix: ocaml: Add package-with-ocaml5.0.

Browse source 
* guix/build-system/ocaml.scm (package-with-ocaml5.0)
(strip-ocaml5.0-variant): New variables.
* gnu/packages/ocaml.scm (ocaml5.0-dune-bootstrap)
(ocaml5.0-dune, ocaml5.0-dune-configurator)
(ocaml5.0-csexp, ocaml5.0-result): New variables.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
This commit is contained in:
pukkamustard 2022-12-16 13:25:03 +00:00 • committed by Julien Lepiller
parent 616e818946
commit 052ec8bcc7
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
2 changed files with 77 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
guix/build-system/ocaml.scm
View file

@ -32,6 +32,8 @@
strip-ocaml4.07-variant
package-with-ocaml4.09
strip-ocaml4.09-variant
package-with-ocaml5.0
strip-ocaml5.0-variant
default-findlib
default-ocaml
lower
@ -111,6 +113,18 @@
(let ((module (resolve-interface '(gnu packages ocaml))))
(module-ref module 'ocaml4.09-dune)))
(define (default-ocaml5.0)
(let ((ocaml (resolve-interface '(gnu packages ocaml))))
(module-ref ocaml 'ocaml-5.0)))
(define (default-ocaml5.0-findlib)
(let ((module (resolve-interface '(gnu packages ocaml))))
(module-ref module 'ocaml5.0-findlib)))
(define (default-ocaml5.0-dune)
(let ((module (resolve-interface '(gnu packages ocaml))))
(module-ref module 'ocaml5.0-dune)))
(define* (package-with-explicit-ocaml ocaml findlib dune old-prefix new-prefix
#:key variant-property)
"Return a procedure of one argument, P. The procedure creates a package
@ -199,6 +213,19 @@ pre-defined variants."
(inherit p)
(properties (alist-delete 'ocaml4.09-variant (package-properties p)))))
(define package-with-ocaml5.0
(package-with-explicit-ocaml (delay (default-ocaml5.0))
(delay (default-ocaml5.0-findlib))
(delay (default-ocaml5.0-dune))
"ocaml-" "ocaml5.0-"
#:variant-property 'ocaml5.0-variant))
(define (strip-ocaml5.0-variant p)
"Remove the 'ocaml5.0-variant' property from P."
(package
(inherit p)
(properties (alist-delete 'ocaml5.0-variant (package-properties p)))))
(define* (lower name
#:key source inputs native-inputs outputs system target
(ocaml (default-ocaml))