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-dune to module ocaml5.

Browse source 
* gnu/packages/ocaml.scm (ocaml5.3-dune): Delete variable.
* gnu/packages/ocaml5.scm (ocaml5.3-dune): New variable.
* guix/build-system/ocaml.scm (default-ocaml5.3-dune): Update package
reference.

Change-Id: I3f3e453e15638e36afbe7fd7bd920bc5fa328d06
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
This commit is contained in:
Jason Conroy 2025-12-21 12:00:09 -05:00 • committed by Julien Lepiller
parent ec23f200ec
commit 9e11bd2c86
No known key found for this signature in database
GPG key ID: 53D457B2D636EE82
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/ocaml.scm
View file

@ -2005,7 +2005,7 @@ config.h files for instance. Among other things, dune-configurator allows one t
(properties `((ocaml4.07-variant . ,(delay ocaml4.07-dune))
(ocaml4.09-variant . ,(delay ocaml4.09-dune))
(ocaml5.0-variant . ,(delay ocaml5.0-dune))
(ocaml5.3-variant . ,(delay ocaml5.3-dune))))))
(ocaml5.3-variant . ,(delay ocaml5:ocaml5.3-dune))))))
(define-public ocaml4.09-dune
(package
@ -2033,12 +2033,6 @@ config.h files for instance. Among other things, dune-configurator allows one t
(propagated-inputs
(list ocaml5.0-dune-configurator))))
(define-public ocaml5.3-dune
(package
(inherit ocaml5:ocaml5.3-dune-bootstrap)
(propagated-inputs
(list ocaml5:ocaml5.3-dune-configurator))))
(define-public ocaml-pp
(package
(name "ocaml-pp")

6
gnu/packages/ocaml5.scm
View file

@ -279,6 +279,12 @@ config.h files for instance. Among other things, dune-configurator allows one t
@item generate config.h file
@end itemize")))
(define-public ocaml5.3-dune
(package
(inherit ocaml5.3-dune-bootstrap)
(propagated-inputs (list ocaml5.3-dune-configurator))
(properties '())))
(define-public ocaml5.3-findlib
(package
(name "ocaml5.3-findlib")

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

@ -137,7 +137,7 @@
(@* (gnu packages ocaml5) ocaml5.3-findlib))
(define (default-ocaml5.3-dune)
(@* (gnu packages ocaml) ocaml5.3-dune))
(@* (gnu packages ocaml5) ocaml5.3-dune))
;; The default versions of core packages within the 5.x series.