[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/14: gnu: Add ocaml-parsexp.
From: |
guix-commits |
Subject: |
04/14: gnu: Add ocaml-parsexp. |
Date: |
Wed, 30 Dec 2020 08:26:55 -0500 (EST) |
roptat pushed a commit to branch master
in repository guix.
commit 662307c30a462d98cb1b16a6c5de208d18adce71
Author: pukkamustard <pukkamustard@posteo.net>
AuthorDate: Mon Dec 28 22:10:06 2020 +0100
gnu: Add ocaml-parsexp.
* gnu/packages/ocaml.scm (ocaml-parsexp): New variable.
(ocaml4.07-parsexp): Inherit from ocaml-parsexp.
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
---
gnu/packages/ocaml.scm | 38 ++++++++++++++++++++------------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 762784a..2ba1dd9 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4066,28 +4066,19 @@ that was developed by Jane Street, the largest
industrial user of OCaml.")
(arguments `(#:tests? #f)) ; no tests
(properties '()))))
-(define-public ocaml4.07-parsexp
+(define-public ocaml-parsexp
(package
- (name "ocaml4.07-parsexp")
- (version "0.11.0")
+ (name "ocaml-parsexp")
+ (version "0.14.0")
(home-page "https://github.com/janestreet/parsexp")
(source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url (string-append home-page ".git"))
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1nyq23s5igd8cf3n4qxprjvhbmb6ighb3fy5mw7hxl0mdgsw5fvz"))))
+ (janestreet-origin "parsexp" version
+
"158znj19dvfdcwsgzs3rdhxpj1g4aw0d4nkfr8c05bahf0lnshlb"))
(build-system dune-build-system)
- (arguments
- `(#:ocaml ,ocaml-4.07
- #:findlib ,ocaml4.07-findlib
- #:dune ,ocaml4.07-dune))
(inputs
- `(("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0))))
+ `(("ocaml-sexplib0" ,ocaml-sexplib0)
+ ("ocaml-base" ,ocaml-base)))
+ (properties `((ocaml4.07-variant . ,(delay ocaml4.07-parsexp))))
(synopsis "S-expression parsing library")
(description
"This library provides generic parsers for parsing S-expressions from
@@ -4116,6 +4107,17 @@ s-expressions from files or other external sources, you
should use
parsexp_io.")
(license license:expat)))
+(define-public ocaml4.07-parsexp
+ (package-with-ocaml4.07
+ (package
+ (inherit ocaml-parsexp)
+ (name "ocaml-parsexp")
+ (version "0.11.0")
+ (source
+ (janestreet-origin "parsexp" version
+
"11a30zkfgbi6pb4whq22k1zc8ghdp9bwxl5s5cdlmx1z8s4yxsf0"))
+ (properties '()))))
+
(define-public ocaml4.07-sexplib
(package
(name "ocaml4.07-sexplib")
@@ -4138,7 +4140,7 @@ parsexp_io.")
#:dune ,ocaml4.07-dune))
(propagated-inputs
`(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num))
- ("ocaml-parsexp" ,ocaml4.07-parsexp)
+ ("ocaml-parsexp" ,(package-with-ocaml4.07 ocaml-parsexp))
("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0))))
(synopsis
"Library for serializing OCaml values to and from S-expressions")
- branch master updated (d1d092f -> 8b03692), guix-commits, 2020/12/30
- 02/14: gnu: Add ocaml-sexplib0., guix-commits, 2020/12/30
- 01/14: gnu: Remove ocaml-js-build-tools., guix-commits, 2020/12/30
- 03/14: gnu: Add ocaml-base., guix-commits, 2020/12/30
- 04/14: gnu: Add ocaml-parsexp.,
guix-commits <=
- 06/14: gnu: Add ocaml-ounit2., guix-commits, 2020/12/30
- 07/14: gnu: ocaml-tyxml: Update to 4.4.0., guix-commits, 2020/12/30
- 10/14: gnu: Add ocaml-version., guix-commits, 2020/12/30
- 09/14: gnu: Add ocaml-odoc., guix-commits, 2020/12/30
- 08/14: gnu: ocaml-markup: Update to 1.0.0., guix-commits, 2020/12/30
- 11/14: gnu: Add ocaml-mdx., guix-commits, 2020/12/30
- 13/14: gnu: Add ocaml-dot-merlin-reader., guix-commits, 2020/12/30
- 14/14: gnu: Add ocaml-merlin., guix-commits, 2020/12/30
- 05/14: gnu: Add ocaml-sexplib., guix-commits, 2020/12/30
- 12/14: gnu: ocaml-yojson: Make dependencies propagated-inputs., guix-commits, 2020/12/30