[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/20: gnu: Add ocaml-compiler-libs.
From: |
guix-commits |
Subject: |
09/20: gnu: Add ocaml-compiler-libs. |
Date: |
Sun, 6 Jun 2021 11:17:49 -0400 (EDT) |
roptat pushed a commit to branch master
in repository guix.
commit cfa65d777071675ca66d59b32f34c4f79a6b16e1
Author: pukkamustard <pukkamustard@posteo.net>
AuthorDate: Tue Jun 1 20:22:52 2021 +0000
gnu: Add ocaml-compiler-libs.
* gnu/packages/ocaml.scm (ocaml-compiler-libs): New variable.
(ocaml4.07-compiler-libs): Inherit from ocaml-compiler-libs.
Signed-off-by: Julien Lepiller <julien@lepiller.eu>
---
gnu/packages/ocaml.scm | 42 +++++++++++++++++++++++++++++-------------
1 file changed, 29 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index dbb34cb..08b6227 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -4083,7 +4083,7 @@ syntax checking on dedukti files.")
`(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
("ocaml-migrate-parsetree"
,(package-with-ocaml4.07 ocaml-migrate-parsetree))
- ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs)
+ ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs))
("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0))
("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio))
("ocaml-ppxlib" ,ocaml4.07-ppxlib)))
@@ -4685,34 +4685,50 @@ provided by companion libraries such as
#:dune ,ocaml4.07-dune))
(properties '()))))
-(define-public ocaml4.07-compiler-libs
+(define-public ocaml-compiler-libs
(package
- (name "ocaml4.07-compiler-libs")
- (version "0.11.0")
+ (name "ocaml-compiler-libs")
+ (version "0.12.3")
(home-page "https://github.com/janestreet/ocaml-compiler-libs")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url (string-append home-page ".git"))
+ (url home-page)
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s"))))
+ "00nrar7h2pyflbdiq6wwwrb4k5jh9iff0jllihzm6ms8d5pspsg5"))))
(build-system dune-build-system)
- (arguments
- `(#:tests? #f ;no tests
- #:ocaml ,ocaml-4.07
- #:findlib ,ocaml4.07-findlib
- #:dune ,ocaml4.07-dune))
- (properties `((upstream-name . "ocaml-compiler-libs")))
+ (arguments `(#:tests? #f)) ;no tests
+ (properties `((upstream-name . "ocaml-compiler-libs")
+ (ocaml4.07-variant . ,(delay ocaml4.07-compiler-libs))))
(synopsis "Compiler libraries repackaged")
(description "This package simply repackages the OCaml compiler libraries
so they don't expose everything at toplevel. For instance, @code{Ast_helper}
is now @code{Ocaml_common.Ast_helper}.")
(license license:expat)))
+(define-public ocaml4.07-compiler-libs
+ (package-with-ocaml4.07
+ (package
+ (inherit ocaml-compiler-libs)
+ (name "ocaml-compiler-libs")
+ (version "0.11.0")
+ (home-page "https://github.com/janestreet/ocaml-compiler-libs")
+ (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
+ "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s"))))
+ (properties `((upstream-name . "ocaml-compiler-libs"))))))
+
(define-public ocaml-stdio
(package
(name "ocaml-stdio")
@@ -4789,7 +4805,7 @@ as part of the same ocaml-migrate-parsetree driver.")
(build-system dune-build-system)
(propagated-inputs
`(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
- ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs)
+ ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs))
("ocaml-migrate-parsetree"
,(package-with-ocaml4.07 ocaml-migrate-parsetree))
("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers))
- branch master updated (b2122b0 -> 52dc188), guix-commits, 2021/06/06
- 02/20: gnu: ocaml-ctypes: Update to 0.18.0., guix-commits, 2021/06/06
- 01/20: gnu: ocaml-integers: Update to 0.4.0., guix-commits, 2021/06/06
- 03/20: gnu: ocaml-ctypes: Make ocaml-integers a propagated input., guix-commits, 2021/06/06
- 05/20: gnu: ocaml-lwt: Update to 5.4.0., guix-commits, 2021/06/06
- 08/20: gnu: Add ocaml-stdio., guix-commits, 2021/06/06
- 09/20: gnu: Add ocaml-compiler-libs.,
guix-commits <=
- 10/20: gnu: ocaml-migrate-parsetree: Update to 2.1.0., guix-commits, 2021/06/06
- 04/20: gnu: ocaml-lwt: Make libev a propagated input., guix-commits, 2021/06/06
- 06/20: gnu: ocaml4.07-gen: Update to 0.5.3., guix-commits, 2021/06/06
- 07/20: gnu: Add ocaml-gen., guix-commits, 2021/06/06
- 11/20: gnu: Add ocaml-ppxlib., guix-commits, 2021/06/06
- 13/20: gnu: Add ocaml-uunf., guix-commits, 2021/06/06
- 14/20: gnu: Add ocaml-ppx-sexp-conv., guix-commits, 2021/06/06
- 17/20: gnu: Add ocaml-syntax-shims., guix-commits, 2021/06/06
- 18/20: gnu: Add ocaml-ppx-compare., guix-commits, 2021/06/06
- 20/20: gnu: Add ocaml-ppx-cold., guix-commits, 2021/06/06