[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/22: gnu: Add ocaml-ppx-base.
From: |
guix-commits |
Subject: |
06/22: gnu: Add ocaml-ppx-base. |
Date: |
Sun, 13 Jun 2021 11:16:18 -0400 (EDT) |
roptat pushed a commit to branch master
in repository guix.
commit b9eca10ffc36e07196a541ae5fabebd213aeac41
Author: pukkamustard <pukkamustard@posteo.net>
AuthorDate: Tue Jun 1 20:23:09 2021 +0000
gnu: Add ocaml-ppx-base.
* gnu/packages/ocaml.scm (ocaml-ppx-base): New variable.
(ocaml4.07-ppx-base): Inherit from ocaml-ppx-base.
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
---
gnu/packages/ocaml.scm | 65 ++++++++++++++++++++++++++++++--------------------
1 file changed, 39 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 57905de..13e13d7 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -5835,34 +5835,28 @@ packages.")
from type definitions.")
(license license:asl2.0)))
-(define-public ocaml4.07-ppx-base
+(define-public ocaml-ppx-base
(package
- (name "ocaml4.07-ppx-base")
- (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_base-v" version ".tar.gz"))
- (sha256
- (base32
- "0aq206pg330jmj7lhcagiiwm3a0b3gsqm801m8ajd4ysyw7idkym"))))
+ (name "ocaml-ppx-base")
+ (version "0.14.0")
+ (source
+ (janestreet-origin
+ "ppx_base" version
+ "0b7a3fmi90jk8paz0g36yzaq670fbnrbi1j8r5ibh9wbcfli7ji6"))
(build-system dune-build-system)
(arguments
- `(#:test-target "."
- #:ocaml ,ocaml-4.07
- #:findlib ,ocaml4.07-findlib
- #:dune ,ocaml4.07-dune))
+ `(#:test-target "."))
(propagated-inputs
- `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare))
- ("ocaml-ppx-enumerate" ,(package-with-ocaml4.07 ocaml-ppx-enumerate))
- ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash))
- ("ocaml-ppx-js-style" ,(package-with-ocaml4.07 ocaml4.07-ppx-js-style))
- ("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))))
- (properties `((upstream-name . "ppx_base")))
+ `(("ocaml-ppx-compare" ,ocaml-ppx-compare)
+ ("ocaml-ppx-cold" ,ocaml-ppx-cold)
+ ("ocaml-ppx-enumerate" ,ocaml-ppx-enumerate)
+ ("ocaml-ppx-hash" ,ocaml-ppx-hash)
+ ("ocaml-ppx-js-style" ,ocaml-ppx-js-style)
+ ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)
+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)
+ ("ocaml-ppxlib" ,ocaml-ppxlib)))
+ (properties `((upstream-name . "ppx_base")
+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-base))))
(home-page "https://github.com/janestreet/ppx_base")
(synopsis "Base set of ppx rewriters")
(description "Ppx_base is the set of ppx rewriters used for Base.
@@ -5871,6 +5865,25 @@ Note that Base doesn't need ppx to build, it is only
used as a
verification tool.")
(license license:asl2.0)))
+(define-public ocaml4.07-ppx-base
+ (package-with-ocaml4.07
+ (package
+ (inherit ocaml-ppx-base)
+ (version "0.11.0")
+ (source
+ (janestreet-origin
+ "ppx_base" version
+ "0aq206pg330jmj7lhcagiiwm3a0b3gsqm801m8ajd4ysyw7idkym"))
+ (propagated-inputs
+ `(("ocaml-ppx-compare" ,ocaml-ppx-compare)
+ ("ocaml-ppx-enumerate" ,ocaml-ppx-enumerate)
+ ("ocaml-ppx-hash" ,ocaml-ppx-hash)
+ ("ocaml-ppx-js-style" ,ocaml-ppx-js-style)
+ ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)
+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)
+ ("ocaml-ppxlib" ,ocaml-ppxlib)))
+ (properties `((upstream-name . "ppx_base"))))))
+
(define-public ocaml4.07-ppx-bin-prot
(package
(name "ocaml4.07-ppx-bin-prot")
@@ -5925,7 +5938,7 @@ functions from type definitions.")
#:dune ,ocaml4.07-dune))
(propagated-inputs
`(("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert))
- ("ocaml-ppx-base" ,ocaml4.07-ppx-base)
+ ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base))
("ocaml-ppx-bench" ,ocaml4.07-ppx-bench)
("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot)
("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07
ocaml-ppx-custom-printf))
@@ -6163,7 +6176,7 @@ standard library that was developed by Jane Street.")
("ocaml-fieldslib" ,ocaml4.07-fieldslib)
("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers)
("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert))
- ("ocaml-ppx-base" ,ocaml4.07-ppx-base)
+ ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base))
("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash))
("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)
("ocaml-ppx-jane" ,ocaml4.07-ppx-jane)
- 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, 2021/06/13
- 03/22: gnu: Add ocaml-ppx-hash., guix-commits, 2021/06/13
- 06/22: gnu: Add ocaml-ppx-base.,
guix-commits <=
- 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
- 14/22: gnu: Add ocaml-ppx-inline-test., guix-commits, 2021/06/13
- 12/22: gnu: Add ocaml-jane-street-headers., guix-commits, 2021/06/13