summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpukkamustard <pukkamustard@posteo.net>2021-06-01 20:23:13 +0000
committerJulien Lepiller <julien@lepiller.eu>2021-06-13 17:15:31 +0200
commitaa7f358808dee6a0b60857c592cdd023d9a2f9e9 (patch)
tree94d1c7e0af29fccf98c267f3667d9400a39fe291
parent90db0c0f17ade7d211225548726fdadbe4431a60 (diff)
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>
-rw-r--r--gnu/packages/ocaml.scm48
1 files changed, 25 insertions, 23 deletions
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index e282edc396..11868365b1 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)