me
/
guix
Archived
1
0
Fork 0
Code

gnu: Add ocaml-ppx-expect. 

* gnu/packages/ocaml.scm (ocaml-ppx-expect): New variable.
  (ocaml4.07-ppx-expect): Inherit from ocaml-ppx-expect.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
master
pukkamustard 2021-06-01 20:23:23 +00:00 committed by Julien Lepiller
parent 10ca414197
commit fac530bca6
No known key found for this signature in database
GPG Key ID: 53D457B2D636EE82
1 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
gnu/packages/ocaml.scm
View File

@ -3803,7 +3803,7 @@ library is currently designed for Unicode Standard 3.2.")
`(("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) `(("ocaml-result" ,(package-with-ocaml4.07 ocaml-result))
("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)))) ("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile))))
(native-inputs (native-inputs
`(("ocaml-ppx-expect" ,ocaml4.07-ppx-expect))) `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect))))
(properties (properties
`((upstream-name . "charInfo_width"))) `((upstream-name . "charInfo_width")))
(home-page "https://bitbucket.org/zandoye/charinfo_width/") (home-page "https://bitbucket.org/zandoye/charinfo_width/")
@ -5888,40 +5888,31 @@ useful errors on failure.")
("ocaml-ppxlib" ,ocaml-ppxlib))) ("ocaml-ppxlib" ,ocaml-ppxlib)))
(properties `((upstream-name . "ppx_assert")))))) (properties `((upstream-name . "ppx_assert"))))))
(define-public ocaml4.07-ppx-expect (define-public ocaml-ppx-expect
(package (package
(name "ocaml4.07-ppx-expect") (name "ocaml-ppx-expect")
(version "0.12.0") (version "0.14.1")
(source (origin (source
(method git-fetch) (origin
(uri (git-reference (method git-fetch)
(url "https://github.com/janestreet/ppx_expect") (uri (git-reference
(commit (string-append "v" version)))) (url "https://github.com/janestreet/ppx_expect")
(file-name (git-file-name name version)) (commit (string-append "v" version))))
(sha256 (file-name (git-file-name name version))
(base32 (sha256
"1wawsbjfkri4sw52n8xqrzihxc3xfpdicv3ahz83a1rsn4lb8j5q")))) (base32
"0vbbnjrzpyk5p0js21lafr6fcp2wqka89p1876rdf472cmg0l7fv"))))
(build-system dune-build-system) (build-system dune-build-system)
(arguments
`(#:ocaml ,ocaml-4.07
#:findlib ,ocaml4.07-findlib
#:dune ,ocaml4.07-dune))
(propagated-inputs (propagated-inputs
`(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) `(("ocaml-base" ,ocaml-base)
("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml4.07-ppx-assert)) ("ocaml-ppx-here" ,ocaml-ppx-here)
("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test)
("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-stdio" ,ocaml-stdio)
("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppxlib" ,ocaml-ppxlib)
("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)
("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-re" ,ocaml-re)))
("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) (properties `((upstream-name . "ppx_expect")
("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) (ocaml4.07-variant . ,(delay ocaml4.07-ppx-expect))))
("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio))
("ocaml-migrate-parsetree"
,(package-with-ocaml4.07 ocaml-migrate-parsetree))
("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))
("ocaml-re" ,(package-with-ocaml4.07 ocaml-re))))
(properties `((upstream-name . "ppx_expect")))
(home-page "https://github.com/janestreet/ppx_expect") (home-page "https://github.com/janestreet/ppx_expect")
(synopsis "Cram like framework for OCaml") (synopsis "Cram like framework for OCaml")
(description "Expect-test is a framework for writing tests in OCaml, similar (description "Expect-test is a framework for writing tests in OCaml, similar
@ -5931,6 +5922,30 @@ output-generating code, interleaved with @code{%expect} extension expressions
to denote the expected output.") to denote the expected output.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public ocaml4.07-ppx-expect
(package-with-ocaml4.07
(package
(inherit ocaml-ppx-expect)
(version "0.12.0")
(source
(janestreet-origin "ppx_expect" version
"1zpci8c49yn2ixchmwjx1kf9pwybv3dnn4l2dgnd6m36qnkralfk"))
(propagated-inputs
`(("ocaml-base" ,ocaml-base)
("ocaml-ppx-assert" ,ocaml-ppx-assert)
("ocaml-ppx-compare" ,ocaml-ppx-compare)
("ocaml-ppx-custom-printf" ,ocaml-ppx-custom-printf)
("ocaml-ppx-fields-conv" ,ocaml-ppx-fields-conv)
("ocaml-ppx-here" ,ocaml-ppx-here)
("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test)
("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)
("ocaml-ppx-variants-conv" ,ocaml-ppx-variants-conv)
("ocaml-stdio" ,ocaml-stdio)
("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)
("ocaml-ppxlib" ,ocaml-ppxlib)
("ocaml-re" ,ocaml-re)))
(properties `((upstream-name . "ppx_expect"))))))
(define-public ocaml-ppx-js-style (define-public ocaml-ppx-js-style
(package (package
(name "ocaml-ppx-js-style") (name "ocaml-ppx-js-style")
@ -6103,7 +6118,7 @@ functions from type definitions.")
("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench)
("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot)
("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf))
("ocaml-ppx-expect" ,ocaml4.07-ppx-expect) ("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect))
("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail)
("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv))
("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here))
@ -6248,7 +6263,7 @@ Configurator allows one to:
#:findlib ,ocaml4.07-findlib #:findlib ,ocaml4.07-findlib
#:dune ,ocaml4.07-dune)) #:dune ,ocaml4.07-dune))
(native-inputs (native-inputs
`(("ocaml-ppx-expect" ,ocaml4.07-ppx-expect))) `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect))))
(home-page "https://github.com/janestreet/spawn") (home-page "https://github.com/janestreet/spawn")
(synopsis "Spawning sub-processes") (synopsis "Spawning sub-processes")
(description (description