[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#47768] [PATCH v2 23/43] gnu: Add ocaml-ppx-custom-printf.
From: |
pukkamustard |
Subject: |
[bug#47768] [PATCH v2 23/43] gnu: Add ocaml-ppx-custom-printf. |
Date: |
Mon, 10 May 2021 05:16:08 +0000 |
* gnu/packages/ocaml.scm (ocaml-ppx-custom-printf): New variable.
(ocaml4.07-ppx-custom-printf): Inherit from ocaml-ppx-custom-printf.
---
gnu/packages/ocaml.scm | 59 ++++++++++++++++++++++++------------------
1 file changed, 34 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 799bebeba9..c4babb30f3 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5160,36 +5160,45 @@ definitions.")
variant types.")
(license license:asl2.0)))
-(define-public ocaml4.07-ppx-custom-printf
+(define-public ocaml-ppx-custom-printf
(package
- (name "ocaml4.07-ppx-custom-printf")
- (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_custom_printf-v" version
".tar.gz"))
- (sha256
- (base32
- "11b73smf3g3bpd9lg014pr4rx285nk9mnk6g6464ph51jv0sqzhj"))))
+ (name "ocaml-ppx-custom-printf")
+ (version "0.14.1")
+ (home-page "https://github.com/janestreet/ppx_custom_printf")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0c1m65kn27zvwmfwy7kk46ga76yw2a3ik9jygpy1b6nn6pi026w9"))))
(build-system dune-build-system)
(propagated-inputs
- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
- ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))
- ("ocaml-migrate-parsetree"
- ,(package-with-ocaml4.07 ocaml-migrate-parsetree))
- ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))
- (arguments
- `(#:ocaml ,ocaml-4.07
- #:findlib ,ocaml4.07-findlib
- #:dune ,ocaml4.07-dune))
- (properties `((upstream-name . "ppx_custom_printf")))
- (home-page "https://github.com/janestreet/ppx_custom_printf")
+ `(("ocaml-base" ,ocaml-base)
+ ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)
+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)
+ ("ocaml-ppxlib" ,ocaml-ppxlib)))
+ (properties `((upstream-name . "ppx_custom_printf")
+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-custom-printf))))
(synopsis "Printf-style format-strings for user-defined string conversion")
(description "Extensions to printf-style format-strings for user-defined
string conversion.")
(license license:asl2.0)))
+(define-public ocaml4.07-ppx-custom-printf
+ (package-with-ocaml4.07
+ (package
+ (inherit ocaml-ppx-custom-printf)
+ (version "0.11.0")
+ (source
+ (janestreet-origin
+ "ppx_custom_printf" version
+ "11b73smf3g3bpd9lg014pr4rx285nk9mnk6g6464ph51jv0sqzhj"))
+ (properties `((upstream-name . "ppx_custom_printf"))))))
+
(define-public ocaml4.07-bin-prot
(package
(name "ocaml4.07-bin-prot")
@@ -5206,7 +5215,7 @@ string conversion.")
(inputs
`(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare))
- ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf)
+ ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07
ocaml-ppx-custom-printf))
("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv)
("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))
("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv)
@@ -5710,7 +5719,7 @@ useful errors on failure.")
`(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml4.07-ppx-assert))
("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare))
- ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf)
+ ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07
ocaml-ppx-custom-printf))
("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv)
("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here))
("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)
@@ -5889,7 +5898,7 @@ functions from type definitions.")
("ocaml-ppx-base" ,ocaml4.07-ppx-base)
("ocaml-ppx-bench" ,ocaml4.07-ppx-bench)
("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot)
- ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf)
+ ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07
ocaml-ppx-custom-printf))
("ocaml-ppx-expect" ,ocaml4.07-ppx-expect)
("ocaml-ppx-fail" ,ocaml4.07-ppx-fail)
("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv)
--
2.31.1
- [bug#47768] [PATCH v2 04/43] gnu: ocaml-lwt: Make libev a propagated input., (continued)
- [bug#47768] [PATCH v2 04/43] gnu: ocaml-lwt: Make libev a propagated input., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 06/43] gnu: ocaml4.07-gen: Update to 0.5.3., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 14/43] gnu: Add ocaml-uunf., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 07/43] gnu: Add ocaml-gen., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 09/43] gnu: Add ocaml-compiler-libs., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 19/43] gnu: Add ocaml-ppx-compare., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 15/43] gnu: Add ocaml-ppx-sexp-conv., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 17/43] gnu: Add ocaml-ppx-let., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 33/43] gnu: Add ocaml-jane-street-headers., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 23/43] gnu: Add ocaml-ppx-custom-printf.,
pukkamustard <=
- [bug#47768] [PATCH v2 03/43] gnu: ocaml-ctypes: Make ocaml-integers a propagated input., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 08/43] gnu: Add ocaml-stdio., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 10/43] gnu: ocaml-migrate-parsetree: Update to 1.8.0., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 05/43] gnu: ocaml-lwt: Update to 5.4.0., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 13/43] gnu: Add ocaml-sedlex., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 12/43] gnu: Add ocaml-ppxlib., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 20/43] gnu: Add ocaml-ppx-here., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 11/43] gnu: ocaml-migrate-parsetree: Update to 2.1.0., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 21/43] gnu: Add ocaml-ppx-cold., pukkamustard, 2021/05/10