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

Merge remote-tracking branch 'origin/master' into core-updates

Browse source 
Conflicts:
	doc/guix.texi
	gnu/local.mk
	gnu/packages/admin.scm
	gnu/packages/base.scm
	gnu/packages/chromium.scm
	gnu/packages/compression.scm
	gnu/packages/databases.scm
	gnu/packages/diffoscope.scm
	gnu/packages/freedesktop.scm
	gnu/packages/gnome.scm
	gnu/packages/gnupg.scm
	gnu/packages/guile.scm
	gnu/packages/inkscape.scm
	gnu/packages/llvm.scm
	gnu/packages/openldap.scm
	gnu/packages/pciutils.scm
	gnu/packages/ruby.scm
	gnu/packages/samba.scm
	gnu/packages/sqlite.scm
	gnu/packages/statistics.scm
	gnu/packages/syndication.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
	gnu/packages/xml.scm
	guix/build-system/copy.scm
	guix/scripts/home.scm
This commit is contained in:
Efraim Flashner 2023-01-30 11:33:18 +02:00
commit 4cf1acc7f3
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
740 changed files with 619028 additions and 314277 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))