[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/22: gnu: Add ocaml-ppx-optional.
From: |
guix-commits |
Subject: |
10/22: gnu: Add ocaml-ppx-optional. |
Date: |
Sun, 13 Jun 2021 11:16:20 -0400 (EDT) |
roptat pushed a commit to branch master
in repository guix.
commit aa7f358808dee6a0b60857c592cdd023d9a2f9e9
Author: pukkamustard <pukkamustard@posteo.net>
AuthorDate: Tue Jun 1 20:23:13 2021 +0000
gnu: Add ocaml-ppx-optional.
* gnu/packages/ocaml.scm (ocaml-ppx-optional): New variable.
(ocaml4.07-ppx-optional): Inherit from ocaml-ppx-optional.
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
---
gnu/packages/ocaml.scm | 48 +++++++++++++++++++++++++-----------------------
1 file changed, 25 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index e282edc..1186836 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5550,31 +5550,22 @@ context such as function arguments.")
@code{|>} and @code{|!}.")
(license license:asl2.0)))
-(define-public ocaml4.07-ppx-optional
+(define-public ocaml-ppx-optional
(package
- (name "ocaml4.07-ppx-optional")
- (version "0.11.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v"
- (version-major+minor version)
- "/files/ppx_optional-v" version ".tar.gz"))
- (sha256
- (base32
- "1z8z2bga95k2vksljljfglg10vygkjd24kn1b37sk4z3nmp47x0h"))))
+ (name "ocaml-ppx-optional")
+ (version "0.14.0")
+ (source
+ (janestreet-origin
+ "ppx_optional" version
+ "1hh6ivlp1qpvyn8l0vhrahkkcp3scf7km254sgplprmk10wnyidz"))
(build-system dune-build-system)
- (arguments
- ;; No tests
- `(#:tests? #f
- #:ocaml ,ocaml-4.07
- #:findlib ,ocaml4.07-findlib
- #:dune ,ocaml4.07-dune))
+ (arguments `(#:tests? #f)) ; No tests
(propagated-inputs
- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
- ("ocaml-migrate-parsetree"
- ,(package-with-ocaml4.07 ocaml-migrate-parsetree))
- ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))
- (properties `((upstream-name . "ppx_optional")))
+ `(("ocaml-base" ,ocaml-base)
+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)
+ ("ocaml-ppxlib" ,ocaml-ppxlib)))
+ (properties `((upstream-name . "ppx_optional")
+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-optional))))
(home-page "https://github.com/janestreet/ppx_optional")
(synopsis "Pattern matching on flat options")
(description
@@ -5582,6 +5573,17 @@ context such as function arguments.")
else expression.")
(license license:asl2.0)))
+(define-public ocaml4.07-ppx-optional
+ (package-with-ocaml4.07
+ (package
+ (inherit ocaml-ppx-optional)
+ (version "0.11.0")
+ (source
+ (janestreet-origin
+ "ppx_optional" version
+ "1z8z2bga95k2vksljljfglg10vygkjd24kn1b37sk4z3nmp47x0h"))
+ (properties `((upstream-name . "ppx_optional"))))))
+
(define-public ocaml-ppx-optcomp
(package
(name "ocaml-ppx-optcomp")
@@ -5967,7 +5969,7 @@ functions from type definitions.")
("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)
("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let))
("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp))
- ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional)
+ ("ocaml-ppx-optional" ,(package-with-ocaml4.07 ocaml-ppx-optional))
("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang)
("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message)
("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value)
- branch master updated (628a6c5 -> d9e1469), guix-commits, 2021/06/13
- 02/22: gnu: Add ocaml-ppx-custom-printf., guix-commits, 2021/06/13
- 10/22: gnu: Add ocaml-ppx-optional.,
guix-commits <=
- 03/22: gnu: Add ocaml-ppx-hash., guix-commits, 2021/06/13
- 06/22: gnu: Add ocaml-ppx-base., guix-commits, 2021/06/13
- 07/22: gnu: Add ocaml-fieldslib., guix-commits, 2021/06/13
- 04/22: gnu: Add ocaml-ppx-enumerate., guix-commits, 2021/06/13
- 01/22: gnu: Add ocaml-ppx-assert., guix-commits, 2021/06/13
- 16/22: gnu: Add ocaml-uri., guix-commits, 2021/06/13
- 08/22: gnu: Add ocaml-ppx-fields-conv., guix-commits, 2021/06/13
- 11/22: gnu: Add ocaml-jst-config., guix-commits, 2021/06/13
- 05/22: gnu: Add ocaml-ppx-js-style., guix-commits, 2021/06/13
- 09/22: gnu: Add ocaml-ppx-optcomp, guix-commits, 2021/06/13