[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#47768] [PATCH 31/37] gnu: Add ocaml-ppx-optional.
From: |
pukkamustard |
Subject: |
[bug#47768] [PATCH 31/37] gnu: Add ocaml-ppx-optional. |
Date: |
Wed, 14 Apr 2021 11:12:57 +0200 |
* gnu/packages/ocaml.scm (ocaml-ppx-optional): New variable.
(ocaml4.07-ppx-optional): Inherit from ocaml-ppx-optional.
---
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 77827e6ece..515cc3984c 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5538,31 +5538,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
@@ -5570,6 +5561,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")
@@ -5955,7 +5957,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)
--
2.31.1
- [bug#47768] [PATCH 34/37] gnu: Add ocaml-time-now., (continued)
- [bug#47768] [PATCH 34/37] gnu: Add ocaml-time-now., pukkamustard, 2021/04/14
- [bug#47768] [PATCH 36/37] gnu: Add ocaml-angstrom., pukkamustard, 2021/04/14
- [bug#47768] [PATCH 30/37] gnu: Add ocaml-ppx-optcomp, pukkamustard, 2021/04/14
- [bug#47768] [PATCH 19/37] gnu: Add ocaml-ppx-compare., pukkamustard, 2021/04/14
- [bug#47768] [PATCH 17/37] gnu: Add ocaml-ppx-let., pukkamustard, 2021/04/14
- [bug#47768] [PATCH 21/37] gnu: Add ocaml-ppx-cold., pukkamustard, 2021/04/14
- [bug#47768] [PATCH 26/37] gnu: Add ocaml-ppx-js-style., pukkamustard, 2021/04/14
- [bug#47768] [PATCH 27/37] gnu: Add ocaml-ppx-base., pukkamustard, 2021/04/14
- [bug#47768] [PATCH 28/37] gnu: Add ocaml-fieldslib., pukkamustard, 2021/04/14
- [bug#47768] [PATCH 32/37] gnu: Add ocaml-jst-config., pukkamustard, 2021/04/14
- [bug#47768] [PATCH 31/37] gnu: Add ocaml-ppx-optional.,
pukkamustard <=
- [bug#47768] [PATCH 33/37] gnu: Add ocaml-jane-street-headers., pukkamustard, 2021/04/14
- [bug#47768] [PATCH 35/37] gnu: Add ocaml-ppx-inline-test., pukkamustard, 2021/04/14
- [bug#47768] [PATCH 37/37] gnu: Add ocaml-uri., pukkamustard, 2021/04/14
- [bug#47768] [PATCH 29/37] gnu: Add ocaml-ppx-fields-conv., pukkamustard, 2021/04/14