[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#47768] [PATCH v3 19/42] gnu: Add ocaml-ppx-here.
From: |
pukkamustard |
Subject: |
[bug#47768] [PATCH v3 19/42] gnu: Add ocaml-ppx-here. |
Date: |
Tue, 1 Jun 2021 20:23:02 +0000 |
* gnu/packages/ocaml.scm (ocaml-ppx-here): New variable.
(ocaml4.07-ppx-here): Inherit from ocaml-ppx-here.
---
gnu/packages/ocaml.scm | 56 ++++++++++++++++++++++--------------------
1 file changed, 29 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 5b88f87f8a..a10d092a92 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5365,37 +5365,39 @@ many values).")
(description "Syntax extension for writing in-line benchmarks in ocaml
code.")
(license license:asl2.0)))
-(define-public ocaml4.07-ppx-here
+(define-public ocaml-ppx-here
(package
- (name "ocaml4.07-ppx-here")
- (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_here-v" version ".tar.gz"))
- (sha256
- (base32
- "0wxcak3ay4jpigm3pfdcpr65qw4hxfa8whhkryhcd8gy71x056z5"))))
+ (name "ocaml-ppx-here")
+ (version "0.14.0")
+ (source
+ (janestreet-origin "ppx_here" version
+
"0b444djy68v6ji0ypwv5l02pkl151qzrgg96lyhl8dxfrzvj1zkj"))
(build-system dune-build-system)
(arguments
;; broken tests
- `(#:tests? #f
- #:ocaml ,ocaml-4.07
- #:findlib ,ocaml4.07-findlib
- #:dune ,ocaml4.07-dune))
+ `(#:tests? #f))
(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_here")))
+ `(("ocaml-base" ,ocaml-base)
+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)
+ ("ocaml-ppxlib" ,ocaml-ppxlib)))
+ (properties `((upstream-name . "ppx_here")
+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-here))))
(home-page "https://github.com/janestreet/ppx_here")
(synopsis "Expands [%here] into its location")
(description
"Part of the Jane Street's PPX rewriters collection.")
(license license:asl2.0)))
+(define-public ocaml4.07-ppx-here
+ (package-with-ocaml4.07
+ (package
+ (inherit ocaml-ppx-here)
+ (version "0.11.0")
+ (source
+ (janestreet-origin "ppx_here" version
+
"0wxcak3ay4jpigm3pfdcpr65qw4hxfa8whhkryhcd8gy71x056z5"))
+ (properties `((upstream-name . "ppx_here"))))))
+
(define-public ocaml4.07-typerep
(package
(name "ocaml4.07-typerep")
@@ -5439,7 +5441,7 @@ many values).")
#:dune ,ocaml4.07-dune))
(propagated-inputs
`(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
- ("ocaml-ppx-here" ,ocaml4.07-ppx-here)
+ ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here))
("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))
("ocaml-migrate-parsetree"
,(package-with-ocaml4.07 ocaml-migrate-parsetree))
@@ -5470,7 +5472,7 @@ ocaml values.")
#:dune ,ocaml4.07-dune))
(propagated-inputs
`(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
- ("ocaml-ppx-here" ,ocaml4.07-ppx-here)
+ ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here))
("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))
("ocaml-migrate-parsetree"
,(package-with-ocaml4.07 ocaml-migrate-parsetree))
@@ -5625,7 +5627,7 @@ match expressions, and if expressions.")
#:dune ,ocaml4.07-dune))
(propagated-inputs
`(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
- ("ocaml-ppx-here" ,ocaml4.07-ppx-here)
+ ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here))
("ocaml-migrate-parsetree"
,(package-with-ocaml4.07 ocaml-migrate-parsetree))
("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))
@@ -5656,7 +5658,7 @@ position.")
(propagated-inputs
`(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare))
- ("ocaml-ppx-here" ,ocaml4.07-ppx-here)
+ ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here))
("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))
("ocaml-migrate-parsetree"
,(package-with-ocaml4.07 ocaml-migrate-parsetree))
@@ -5692,7 +5694,7 @@ useful errors on failure.")
("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare))
("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf)
("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv)
- ("ocaml-ppx-here" ,ocaml4.07-ppx-here)
+ ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here))
("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)
("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))
("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv)
@@ -5835,7 +5837,7 @@ verification tool.")
(propagated-inputs
`(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
("ocaml-bin-prot" ,ocaml4.07-bin-prot)
- ("ocaml-ppx-here" ,ocaml4.07-ppx-here)
+ ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here))
("ocaml-migrate-parsetree"
,(package-with-ocaml4.07 ocaml-migrate-parsetree))
("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))
@@ -5873,7 +5875,7 @@ functions from type definitions.")
("ocaml-ppx-expect" ,ocaml4.07-ppx-expect)
("ocaml-ppx-fail" ,ocaml4.07-ppx-fail)
("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv)
- ("ocaml-ppx-here" ,ocaml4.07-ppx-here)
+ ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here))
("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)
("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let))
("ocaml-ppx-optcomp" ,ocaml4.07-ppx-optcomp)
--
2.31.1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [bug#47768] [PATCH v3 19/42] gnu: Add ocaml-ppx-here.,
pukkamustard <=