[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
26/28: gnu: Add ocaml5.0-merlin-lib.
From: |
guix-commits |
Subject: |
26/28: gnu: Add ocaml5.0-merlin-lib. |
Date: |
Wed, 21 Dec 2022 16:11:44 -0500 (EST) |
roptat pushed a commit to branch master
in repository guix.
commit 134480a381cbf38453c8cd4333b873ad2a51765e
Author: pukkamustard <pukkamustard@posteo.net>
AuthorDate: Fri Dec 16 13:25:25 2022 +0000
gnu: Add ocaml5.0-merlin-lib.
* gnu/packages/ocaml.scm (ocaml5.0-merlin-lib): New variable.
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
---
gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index c31ad6c8f9..30e895eee6 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5384,12 +5384,34 @@ serializers and deserializers from type definitions.")
(arguments '(#:package "merlin-lib"
#:tests? #f)) ; no tests
(propagated-inputs (list ocaml-csexp ocaml-menhir))
+ (properties `((ocaml5.0-variant . ,(delay ocaml5.0-merlin-lib))))
(home-page "https://ocaml.github.io/merlin/")
(synopsis "Merlin libraries")
(description "These libraries provides access to low-level compiler
interfaces and the standard higher-level merlin protocol.")
(license license:expat)))
+;; the 500 indicates that this version is for OCaml 5.0
+(define ocaml-merlin-lib-500
+ (package
+ (inherit ocaml-merlin-lib)
+ (name "ocaml-merlin-lib")
+ (version "4.7.1-500")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ocaml/merlin")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01"))))
+ (properties '())))
+
+(define-public ocaml5.0-merlin-lib
+ (package-with-ocaml5.0 ocaml-merlin-lib-500))
+
(define-public ocaml-dot-merlin-reader
(package
(inherit ocaml-merlin-lib)
- 10/28: gnu: Add ocaml5.0-base., (continued)
- 10/28: gnu: Add ocaml5.0-base., guix-commits, 2022/12/21
- 12/28: gnu: Update ocaml-qcheck to 0.20., guix-commits, 2022/12/21
- 14/28: gnu: Update ocaml-odoc to 2.2.0., guix-commits, 2022/12/21
- 20/28: gnu: Add ocaml5.0-eio., guix-commits, 2022/12/21
- 24/28: gnu: Add ocaml5.0-eio-main., guix-commits, 2022/12/21
- 06/28: gnu: Add ocaml-psq., guix-commits, 2022/12/21
- 05/28: gnu: opam: Use OCaml 4.14 compiled version when building OCaml 5.0 packages., guix-commits, 2022/12/21
- 09/28: gnu: Add ocaml-hmap., guix-commits, 2022/12/21
- 11/28: gnu: Update ocaml-ppxlib to 0.25.1., guix-commits, 2022/12/21
- 19/28: gnu: ocaml-mdx: Move inputs to propagated-inputs., guix-commits, 2022/12/21
- 26/28: gnu: Add ocaml5.0-merlin-lib.,
guix-commits <=
- 16/28: gnu: Add ocaml-lwt-dllist., guix-commits, 2022/12/21
- 18/28: gnu: Add ocaml-bechamel., guix-commits, 2022/12/21
- 23/28: gnu: Add ocaml5.0-eio-linux., guix-commits, 2022/12/21
- 28/28: gnu: Add ocaml5.0-merlin., guix-commits, 2022/12/21
- 22/28: gnu: Add ocaml-uring., guix-commits, 2022/12/21