[PATCH 00/37] Assorted OCaml patches

OpenSubmitted by pukkamustard.
Details
2 participants
  • Maxime Devos
  • pukkamustard
Owner
unassigned
Severity
normal
P
P
pukkamustard wrote on 14 Apr 11:08 +0200
(address . guix-patches@gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414090800.6458-1-pukkamustard@posteo.net
Hello Guix,
I have been collecting some patches to the OCaml packaging in Guix. It has gota bit long, sorry for that.
The main theme of this series is to provide basic OCaml packages in Guix thatalso work with more recent version of OCaml. Currently most OCaml packages inGuix are only for OCaml 4.07.
Most patches are of following form:
- Add new ocaml-X package with latest upstream verison of X- Make existing ocaml4.07-X package inherit from new ocaml-X
Some packages are newly added because I am using them (ocaml-uunf andocaml-angstrom) or because they are dependencies of newer version of packagesalready in Guix (e.g. ocaml-time-now).
There are still quite a few packages in Guix that are only available for OCaml4.07 (ocaml4.07-X but no ocaml-X). Eventually adding them would be nice forOCaml hackers working with recent version of the compiler. As I understand wewant to keep the ocaml4.07-* packages for bootstrapping purposes.
Thanks,pukkamustard
pukkamustard (37): gnu: ocaml-integers: Update to 0.4.0. gnu: ocaml-ctypes: Update to 0.18.0. gnu: ocaml-ctypes: Make ocaml-integers a propagated input. gnu: ocaml-lwt: Make libev a propagated input. gnu: ocaml-lwt: Update to 5.4.0. gnu: ocaml4.07-gen: Update to 0.5.3. gnu: Add ocaml-gen. gnu: Add ocaml-stdio. gnu: Add ocaml-compiler-libs. gnu: ocaml-migrate-parsetree: Update to 1.8.0. gnu: ocaml-migrate-parsetree: Update to 2.1.0. gnu: Add ocaml-ppxlib. gnu: Add ocaml-sedlex. gnu: Add ocaml-uunf. gnu: Add ocaml-ppx-sexp-conv. gnu: Add ocaml-bigstringaf. gnu: Add ocaml-ppx-let. gnu: Add ocaml-syntax-shims. gnu: Add ocaml-ppx-compare. gnu: Add ocaml-ppx-here. gnu: Add ocaml-ppx-cold. gnu: Add ocaml-ppx-assert. gnu: Add ocaml-ppx-custom-printf. gnu: Add ocaml-ppx-hash. gnu: Add ocaml-ppx-enumerate. gnu: Add ocaml-ppx-js-style. gnu: Add ocaml-ppx-base. gnu: Add ocaml-fieldslib. gnu: Add ocaml-ppx-fields-conv. gnu: Add ocaml-ppx-optcomp gnu: Add ocaml-ppx-optional. gnu: Add ocaml-jst-config. gnu: Add ocaml-jane-street-headers. gnu: Add ocaml-time-now. gnu: Add ocaml-ppx-inline-test. gnu: Add ocaml-angstrom. gnu: Add ocaml-uri.
gnu/packages/ocaml.scm | 1476 ++++++++++++++++++++++++++-------------- 1 file changed, 949 insertions(+), 527 deletions(-)
-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 01/37] gnu: ocaml-integers: Update to 0.4.0.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-1-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-integers): Update to 0.4.0.--- gnu/packages/ocaml.scm | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-)
Toggle diff (54 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 44ca0c67e2..801930696d 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -17,7 +17,7 @@ ;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2020 divoplade <d@divoplade.fr>-;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>+;;; Copyright © 2020, 2021 pukkamustard <pukkamustard@posteo.net> ;;; Copyright © 2021 aecepoglu <aecepoglu@fastmail.fm> ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com> ;;;@@ -3810,29 +3810,20 @@ sensitive completion, colors, and more.") (define-public ocaml-integers (package (name "ocaml-integers")- (version "0.3.0")+ (version "0.4.0") (home-page "https://github.com/ocamllabs/ocaml-integers") (source (origin- (method url-fetch)- (uri (string-append home-page- "/releases/download/v0.2.2/integers-"- version ".tbz"))- (file-name (string-append name "-" version ".tbz"))+ (method git-fetch)+ (uri (git-reference+ (url home-page)+ (commit version)))+ (file-name (git-file-name name version)) (sha256 (base32- "08b1ljw88ny3l0mdq6xmffjk8anfc77igryva5jz1p6f4f746ywk"))))- (build-system ocaml-build-system)+ "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd"))))+ (build-system dune-build-system) (arguments- `(#:tests? #f; no tests- #:build-flags (list "build")- #:phases- (modify-phases %standard-phases- (delete 'configure))))- (native-inputs- `(("ocamlbuild" ,ocamlbuild)))- (inputs- `(("topkg" ,ocaml-topkg)- ("opam" ,opam)))+ `(#:tests? #f)) ; no tests (synopsis "Various signed and unsigned integer types for OCaml") (description "The ocaml-integers library provides a number of 8-, 16-, 32- and 64-bit signed and unsigned integer types, together with aliases such as-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 02/37] gnu: ocaml-ctypes: Update to 0.18.0.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-2-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ctypes): Update to 0.18.0.--- gnu/packages/ocaml.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Toggle diff (33 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 801930696d..f208f86075 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -3833,7 +3833,7 @@ long and size_t whose sizes depend on the host platform.") (define-public ocaml-ctypes (package (name "ocaml-ctypes")- (version "0.14.0")+ (version "0.18.0") (home-page "https://github.com/ocamllabs/ocaml-ctypes") (source (origin (method git-fetch)@@ -3843,7 +3843,7 @@ long and size_t whose sizes depend on the host platform.") (file-name (git-file-name name version)) (sha256 (base32- "1b2q3h63ngf4x9qp65qwapf2dg9q0mcdah6qjm2q0c7v2p5vysv9"))))+ "03zrbnl16m67ls0yfhq7a4k4238x6x6b3m456g4dw2yqwc153vks")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require an old lwt@@ -3862,6 +3862,8 @@ long and size_t whose sizes depend on the host platform.") (delete 'configure)))) (native-inputs `(("pkg-config" ,pkg-config)))+ (propagated-inputs+ `(("bigarray-compat" ,ocaml-bigarray-compat))) (inputs `(("libffi" ,libffi) ("ounit" ,ocaml-ounit)-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 03/37] gnu: ocaml-ctypes: Make ocaml-integers a propagated input.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-3-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ctypes)[propagated-inputs]: Add ocaml-integers. [inputs]: Remove ocaml-integers.--- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (20 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex f208f86075..0ce74db21c 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -3863,11 +3863,11 @@ long and size_t whose sizes depend on the host platform.") (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs- `(("bigarray-compat" ,ocaml-bigarray-compat)))+ `(("bigarray-compat" ,ocaml-bigarray-compat)+ ("integers" ,ocaml-integers))) (inputs `(("libffi" ,libffi) ("ounit" ,ocaml-ounit)- ("integers" ,ocaml-integers) ("lwt" ,ocaml-lwt) ("topkg" ,ocaml-topkg) ("opam" ,opam)))-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 04/37] gnu: ocaml-lwt: Make libev a propagated input.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-4-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-lwt) [propagated-inputs]: Add libev. [inputs]: Remove libev. (ocaml-ouint2, ocaml4.07-lambda-term, ocaml-markup) [inputs]: Remove libev.--- gnu/packages/ocaml.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
Toggle diff (51 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 0ce74db21c..4fc9a45cb0 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -1342,9 +1342,6 @@ compilers that can directly deal with packages.") (base32 "0gxjw1bhmjcjzri6x6psqrkbbyq678b69bqfl9i1zswp7cj2lryg")))) (build-system dune-build-system)- (inputs- ;; XXX Should libev be a propagated-input of ocaml-lwt?- `(("libev" ,libev))) (propagated-inputs `(("lwt" ,ocaml-lwt) ("ocaml-stdlib-shims" ,ocaml-stdlib-shims)))@@ -2318,13 +2315,13 @@ for mapping files in memory. This function is the same as the ("ocaml-cppo" ,ocaml-cppo) ("pkg-config" ,pkg-config))) (inputs- `(("libev" ,libev)- ("glib" ,glib)))+ `(("glib" ,glib))) (propagated-inputs `(("ocaml-mmap" ,ocaml-mmap) ("ocaml-ocplib-endian" ,ocaml-ocplib-endian) ("ocaml-result" ,ocaml-result)- ("ocaml-seq" ,ocaml-seq)))+ ("ocaml-seq" ,ocaml-seq)+ ("libev" ,libev))) (home-page "https://github.com/ocsigen/lwt") (synopsis "Cooperative threads and I/O in monadic style") (description "Lwt provides typed, composable cooperative threads. These@@ -3761,8 +3758,6 @@ connect an engine to your inputs and rendering functions to get an editor.") ("ocaml-lwt-log" ,(package-with-ocaml4.07 ocaml-lwt-log)) ("ocaml-lwt-react" ,(package-with-ocaml4.07 ocaml-lwt-react)) ("ocaml-zed" ,ocaml4.07-zed)))- (inputs- `(("libev" ,libev))) (home-page "https://github.com/diml/lambda-term") (synopsis "Terminal manipulation library for OCaml") (description "Lambda-Term is a cross-platform library for manipulating the@@ -6011,8 +6006,6 @@ the full Core is not available, such as in Javascript.") (build-system dune-build-system) (arguments `(#:package "markup"))- (inputs- `(("libev" ,libev))) (propagated-inputs `(("ocaml-bisect-ppx" ,ocaml-bisect-ppx) ("ocaml-uchar" ,ocaml-uchar)-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 05/37] gnu: ocaml-lwt: Update to 5.4.0.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-5-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-lwt): Update to 5.4.0.--- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (24 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 4fc9a45cb0..85218b6832 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -2297,7 +2297,7 @@ for mapping files in memory. This function is the same as the (define-public ocaml-lwt (package (name "ocaml-lwt")- (version "5.1.1")+ (version "5.4.0") (source (origin (method git-fetch)@@ -2306,7 +2306,7 @@ for mapping files in memory. This function is the same as the (commit version))) (file-name (git-file-name name version)) (sha256 (base32- "1nl7rdnwfdhwcsm5zpay1nr9y5cbapd9x1qzily7zk9ab4v52m8g"))))+ "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d")))) (build-system dune-build-system) (arguments `(#:package "lwt"))-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 06/37] gnu: ocaml4.07-gen: Update to 0.5.3.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-6-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml4.07-gen): Update to 4.07.--- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (24 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 85218b6832..503913c8fd 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -2511,7 +2511,7 @@ representation of the data.") (define-public ocaml4.07-gen (package (name "ocaml4.07-gen")- (version "0.5.2")+ (version "0.5.3") (source (origin (method git-fetch) (uri (git-reference@@ -2520,7 +2520,7 @@ representation of the data.") (file-name (git-file-name name version)) (sha256 (base32- "1h9g508rnj2j8va5nvhamzscp954vrkh0hdf4pn3d10pcfyslfg2"))))+ "1jzrs0nsdk55annkd2zrk5svi61i3b1nk6qyqdc2y26vnzqvzfg8")))) (build-system dune-build-system) (arguments `(#:tests? #f; no tests-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 07/37] gnu: Add ocaml-gen.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-7-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-gen): New variable. (ocaml4.07-gen): Remove variable. (ocaml4.07-sedlex): Replace ocaml4.07-gen with ocaml-gen.--- gnu/packages/ocaml.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
Toggle diff (47 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 503913c8fd..43a3bc1d40 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -2508,9 +2508,9 @@ format. It can process XML documents without a complete in-memory representation of the data.") (license license:isc))) -(define-public ocaml4.07-gen+(define-public ocaml-gen (package- (name "ocaml4.07-gen")+ (name "ocaml-gen") (version "0.5.3") (source (origin (method git-fetch)@@ -2524,15 +2524,12 @@ representation of the data.") (build-system dune-build-system) (arguments `(#:tests? #f; no tests- #:package "gen"- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ #:package "gen")) (propagated-inputs- `(("ocaml-odoc" ,(package-with-ocaml4.07 ocaml4.07-odoc))))+ `(("ocaml-odoc" ,ocaml-odoc))) (native-inputs- `(("ocaml-qtest" ,(package-with-ocaml4.07 ocaml-qtest))- ("ocaml-qcheck" ,(package-with-ocaml4.07 ocaml-qcheck))))+ `(("ocaml-qtest" ,ocaml-qtest)+ ("ocaml-qcheck" ,ocaml-qcheck))) (home-page "https://github.com/c-cube/gen/") (synopsis "Iterators for OCaml, both restartable and consumable") (description "Gen implements iterators of OCaml, that are both restartable@@ -2577,7 +2574,7 @@ and consumable.") (native-inputs `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) (propagated-inputs- `(("ocaml-gen" ,ocaml4.07-gen)+ `(("ocaml-gen" ,(package-with-ocaml4.07 ocaml-gen)) ("ocaml-ppx-tools-versioned" ,(package-with-ocaml4.07 ocaml-ppx-tools-versioned)) ("ocaml-uchar" ,(package-with-ocaml4.07 ocaml-uchar))))-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 08/37] gnu: Add ocaml-stdio.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-8-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-stdio): New variable. (ocaml4.07-stdio): Inherit from ocaml-stdio.--- gnu/packages/ocaml.scm | 58 +++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-)
Toggle diff (153 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 43a3bc1d40..03bcb3d351 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -1978,7 +1978,7 @@ library.") #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-stdio" ,ocaml4.07-stdio)+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("pkg-config" ,pkg-config))) (inputs `(("sqlite" ,sqlite)))@@ -4086,7 +4086,7 @@ syntax checking on dedukti files.") ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0))- ("ocaml-stdio" ,ocaml4.07-stdio)+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (properties `((upstream-name . "ppx_inline_test"))) (synopsis "Syntax extension for writing in-line tests in ocaml code")@@ -4429,7 +4429,7 @@ Atom.") `(("gsl" ,gsl))) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-stdio" ,ocaml4.07-stdio)))+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://mmottl.github.io/gsl-ocaml") (synopsis "Bindings to the GNU Scientific Library") (description@@ -4714,30 +4714,20 @@ 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-stdio+(define-public ocaml-stdio (package- (name "ocaml4.07-stdio")- (version "0.11.0")+ (name "ocaml-stdio")+ (version "0.14.0") (home-page "https://github.com/janestreet/stdio") (source- (origin- (method git-fetch)- (uri (git-reference- (url (string-append home-page ".git"))- (commit (string-append "v" version))))- (file-name (git-file-name name version))- (sha256- (base32- "1facajqhvq34g2wrg368y0ajxd6lrj5b3lyzyj0jhdmraxajjcwn"))))+ (janestreet-origin "stdio" version+ "1hj5hraprqy2i90a690l11yjszvb99j818q3d684ryx6p2lddk0l")) (build-system dune-build-system) (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0))))- (arguments- `(#:tests? #f ;no tests- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-sexplib0" ,ocaml-sexplib0)))+ (arguments `(#:tests? #f)) ;no tests+ (properties `((ocaml4.07-variant . ,(delay ocaml4.07-stdio)))) (synopsis "Standard IO library for OCaml") (description "Stdio implements simple input/output functionalities for OCaml. It@@ -4745,6 +4735,16 @@ re-exports the input/output functions of the OCaml standard libraries using a more consistent API.") (license license:expat))) +(define-public ocaml4.07-stdio+ (package-with-ocaml4.07+ (package+ (inherit ocaml-stdio)+ (version "0.11.0")+ (source+ (janestreet-origin "stdio" version+ "0pqbp2wy5fgmc38irwvmj9nlcvclb1ix1mp4y7l39bgvvlz303h9"))+ (properties '()))))+ (define-public ocaml-ppx-derivers (package (name "ocaml-ppx-derivers")@@ -4794,7 +4794,7 @@ as part of the same ocaml-migrate-parsetree driver.") ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers))- ("ocaml-stdio" ,ocaml4.07-stdio)+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (arguments@@ -5422,7 +5422,7 @@ else expression.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-stdio" ,ocaml4.07-stdio)+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (properties `((upstream-name . "ppx_optcomp"))) (home-page "https://github.com/janestreet/ppx_optcomp")@@ -5551,7 +5551,7 @@ useful errors on failure.") ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv)- ("ocaml-stdio" ,ocaml4.07-stdio)+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib)@@ -5827,7 +5827,7 @@ various Jane Street packages.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-stdio" ,ocaml4.07-stdio)))+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://github.com/janestreet/configurator") (synopsis "Helper library for gathering system configuration") (description "Configurator is a small library that helps writing OCaml@@ -5920,7 +5920,7 @@ thousands of times faster than fork. ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-spawn" ,ocaml4.07-spawn)- ("ocaml-stdio" ,ocaml4.07-stdio)+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))@@ -5967,7 +5967,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-splittable-random" ,ocaml4.07-splittable-random)- ("ocaml-stdio" ,ocaml4.07-stdio)+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-typerep" ,ocaml4.07-typerep) ("ocaml-variantslib" ,ocaml4.07-variantslib) ("ocaml-migrate-parsetree"@@ -6251,7 +6251,7 @@ library FFTW.") `(("openblas" ,openblas) ("lapack" ,lapack) ("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-stdio" ,ocaml4.07-stdio)))+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://mmottl.github.io/lacaml/") (synopsis "OCaml-bindings to BLAS and LAPACK")-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 09/37] gnu: Add ocaml-compiler-libs.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-9-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-compiler-libs): New variable. (ocaml4.07-compiler-libs): Inherit from ocaml-compiler-libs.--- gnu/packages/ocaml.scm | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-)
Toggle diff (86 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 03bcb3d351..1f47fc4de3 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4084,7 +4084,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)))@@ -4686,34 +4686,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")@@ -4790,7 +4806,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))-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 10/37] gnu: ocaml-migrate-parsetree: Update to 1.8.0.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-10-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 1.8.0.--- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (24 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 1f47fc4de3..ab9198c3c6 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -1771,7 +1771,7 @@ module of this library is parameterised by the type of S-expressions.") (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree")- (version "1.7.3")+ (version "1.8.0") (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") (source (origin@@ -1782,7 +1782,7 @@ module of this library is parameterised by the type of S-expressions.") (file-name (git-file-name name version)) (sha256 (base32- "0336vz0galjnsazbmkxjwdv1qvdqsx2rgrvp778xgq2fzasz45cx"))))+ "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) (build-system dune-build-system) (arguments `(#:tests? #f))-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 11/37] gnu: ocaml-migrate-parsetree: Update to 2.1.0.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-11-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 2.1.0. (ocaml-migrate-parsetree-1): New variable.--- gnu/packages/ocaml.scm | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-)
Toggle diff (92 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex ab9198c3c6..9b3e6b779c 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -1771,32 +1771,51 @@ module of this library is parameterised by the type of S-expressions.") (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree")- (version "1.8.0")+ (version "2.1.0") (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") (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- "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq"))))+ "1cpgdqcs624nd1p271ddakgyibl0ia4f6dzivnz9qdwszsinwr89")))) (build-system dune-build-system)- (arguments- `(#:tests? #f))+ (arguments `(#:tests? #f)) (propagated-inputs `(("ocaml-ppx-derivers" ,ocaml-ppx-derivers) ("ocamlbuild" ,ocamlbuild) ("ocaml-result" ,ocaml-result)))- (properties `((upstream-name . "ocaml-migrate-parsetree")))+ (properties `((upstream-name . "ocaml-migrate-parsetree")+ ;; OCaml 4.07 packages require version 1.*+ (ocaml4.07-variant . ,(delay (package-with-ocaml4.07 ocaml-migrate-parsetree-1))))) (synopsis "OCaml parsetree converter") (description "This library converts between parsetrees of different OCaml versions. For each version, there is a snapshot of the parsetree and conversion functions to the next and/or previous version.") (license license:lgpl2.1+)))- ++(define-public ocaml-migrate-parsetree-1+ (package+ (inherit ocaml-migrate-parsetree)+ (name "ocaml-migrate-parsetree-1")+ (version "1.8.0")+ (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree")+ (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+ "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq"))))+ (properties '((upstream-name . "ocaml-migrate-parsetree")))))+ (define-public ocaml-ppx-tools-versioned (package (name "ocaml-ppx-tools-versioned")@@ -1815,7 +1834,7 @@ functions to the next and/or previous version.") `(#:test-target "." #:package "ppx_tools_versioned")) (propagated-inputs- `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)))+ `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1))) (properties `((upstream-name . "ppx_tools_versioned"))) (home-page "https://github.com/let-def/ppx_tools_versioned") (synopsis "Variant of ppx_tools")@@ -6121,7 +6140,7 @@ combinators.") "0900vli5kw7s5kdam0n4cqsfsfqb7mdb3azn3i55595gilg1vyn8")))) (build-system dune-build-system) (propagated-inputs- `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1) ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) ("ocaml-ounit" ,ocaml-ounit))) (arguments@@ -6360,7 +6379,7 @@ variants.") ("ocaml-cmdliner" ,ocaml-cmdliner) ("ocaml-re" ,ocaml-re) ("ocaml-result" ,ocaml-result)- ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1) ("ocaml-odoc" ,ocaml-odoc) ("ocaml-version" ,ocaml-version))) (native-inputs-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 12/37] gnu: Add ocaml-ppxlib.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-12-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppxlib): New variable. (ocaml4.07-ppxlib): Inherit from ocaml-ppxlib.--- gnu/packages/ocaml.scm | 144 +++++++++++++++++++++++------------------ 1 file changed, 81 insertions(+), 63 deletions(-)
Toggle diff (365 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 9b3e6b779c..7848a2b3e5 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4106,7 +4106,7 @@ syntax checking on dedukti files.") ("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)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_inline_test"))) (synopsis "Syntax extension for writing in-line tests in ocaml code") (description "This package contains a syntax extension for writing@@ -4807,54 +4807,32 @@ ppx_deriving and ppx_type_conv to inter-operate gracefully when linked as part of the same ocaml-migrate-parsetree driver.") (license license:bsd-3))) -(define-public ocaml4.07-ppxlib+(define-public ocaml-ppxlib (package- (name "ocaml4.07-ppxlib")- (version "0.6.0")+ (name "ocaml-ppxlib")+ (version "0.22.0") (home-page "https://github.com/ocaml-ppx/ppxlib") (source (origin (method git-fetch) (uri (git-reference- (url (string-append home-page ".git"))+ (url home-page) (commit version))) (file-name (git-file-name name version)) (sha256 (base32- "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv"))))+ "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q")))) (build-system dune-build-system) (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("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))- ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio))- ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result))- ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0))))- (arguments- `(#:phases- (modify-phases %standard-phases- (add-before 'check 'set-topfind- (lambda* (#:key inputs #:allow-other-keys)- ;; add the line #directory ".." at the top of each file- ;; using #use "topfind";; to be able to find topfind- (let* ((findlib-path (assoc-ref inputs "findlib"))- (findlib-libdir- (string-append findlib-path "/lib/ocaml/site-lib")))- (substitute* '("test/base/test.ml"- "test/code_path/test.ml"- "test/deriving/test.ml"- "test/driver/attributes/test.ml"- "test/driver/non-compressible-suffix/test.ml"- "test/driver/transformations/test.ml")- (("#use \"topfind\";;" all)- (string-append "#directory \"" findlib-libdir "\"\n"- all))))- #t)))- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-compiler-libs" ,ocaml-compiler-libs)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-stdlib-shims" ,ocaml-stdlib-shims)+ ("ocaml-ppx-derivers" ,ocaml-ppx-derivers)+ ("ocaml-stdio" ,ocaml-stdio)+ ("ocaml-result" ,ocaml-result)+ ("ocaml-sexplib0" ,ocaml-sexplib0)))+ (properties `((ocaml4.07-variant . ,(delay ocaml4.07-ppxlib)))) (synopsis "Base library and tools for ppx rewriters") (description@@ -4872,6 +4850,46 @@ OCaml AST in the OCaml syntax; @end itemize") (license license:expat))) +(define-public ocaml4.07-ppxlib+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppxlib)+ (name "ocaml-ppxlib")+ (version "0.6.0")+ (home-page "https://github.com/ocaml-ppx/ppxlib")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url home-page)+ (commit version)))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv"))))+ (build-system dune-build-system)+ (arguments+ `(#:phases+ (modify-phases %standard-phases+ (add-before 'check 'set-topfind+ (lambda* (#:key inputs #:allow-other-keys)+ ;; add the line #directory ".." at the top of each file+ ;; using #use "topfind";; to be able to find topfind+ (let* ((findlib-path (assoc-ref inputs "findlib"))+ (findlib-libdir+ (string-append findlib-path "/lib/ocaml/site-lib")))+ (substitute* '("test/base/test.ml"+ "test/code_path/test.ml"+ "test/deriving/test.ml"+ "test/driver/attributes/test.ml"+ "test/driver/non-compressible-suffix/test.ml"+ "test/driver/transformations/test.ml")+ (("#use \"topfind\";;" all)+ (string-append "#directory \"" findlib-libdir "\"\n"+ all))))+ #t)))))+ (properties '()))))+ (define-public ocaml4.07-ppx-compare (package (name "ocaml4.07-ppx-compare")@@ -4890,7 +4908,7 @@ OCaml AST in the OCaml syntax; `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib@@ -4929,7 +4947,7 @@ by making sure that you only compare comparable values.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "fieldslib"))) (home-page "https://github.com/janestreet/fieldslib") (synopsis "Syntax extension to record fields")@@ -4961,7 +4979,7 @@ of a record and create new record values.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "variantslib"))) (home-page "https://github.com/janestreet/variantslib") (synopsis "OCaml variants as first class values")@@ -4987,7 +5005,7 @@ standard library.") ("ocaml-fieldslib" ,ocaml4.07-fieldslib) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib@@ -5019,7 +5037,7 @@ new record values.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib@@ -5050,7 +5068,7 @@ definitions.") ("ocaml-variantslib" ,ocaml4.07-variantslib) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib@@ -5083,7 +5101,7 @@ variant types.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib@@ -5183,7 +5201,7 @@ storage of large amounts of data.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib@@ -5218,7 +5236,7 @@ hash functions from type exrpessions and definitions.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_enumerate"))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type")@@ -5250,7 +5268,7 @@ many values).") `(("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_bench"))) (home-page "https://github.com/janestreet/ppx_bench") (synopsis "Syntax extension for writing in-line benchmarks in ocaml code")@@ -5280,7 +5298,7 @@ many values).") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_here"))) (home-page "https://github.com/janestreet/ppx_here") (synopsis "Expands [%here] into its location")@@ -5335,7 +5353,7 @@ many values).") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_sexp_value"))) (home-page "https://github.com/janestreet/ppx_sexp_value") (synopsis "Simplify building s-expressions from ocaml values")@@ -5366,7 +5384,7 @@ ocaml values.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_sexp_message"))) (home-page "https://github.com/janestreet/ppx_sexp_message") (synopsis "A ppx rewriter for easy construction of s-expressions")@@ -5398,7 +5416,7 @@ context such as function arguments.") (propagated-inputs `(("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_pipebang"))) (home-page "https://github.com/janestreet/ppx_pipebang") (synopsis "Inline reverse application operators `|>` and `|!`")@@ -5429,7 +5447,7 @@ context such as function arguments.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_optional"))) (home-page "https://github.com/janestreet/ppx_optional") (synopsis "Pattern matching on flat options")@@ -5458,7 +5476,7 @@ else expression.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_optcomp"))) (home-page "https://github.com/janestreet/ppx_optcomp") (synopsis "Optional compilation for OCaml")@@ -5488,7 +5506,7 @@ size, the version of the compiler, ...") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_let"))) (home-page "https://github.com/janestreet/ppx_let") (synopsis "Monadic let-bindings")@@ -5518,7 +5536,7 @@ match expressions, and if expressions.") ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_fail"))) (home-page "https://github.com/janestreet/ppx_fail") (synopsis "Add location to calls to failwiths")@@ -5550,7 +5568,7 @@ position.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_assert"))) (home-page "https://github.com/janestreet/ppx_assert") (synopsis "Assert-like extension nodes that raise useful errors on failure")@@ -5589,7 +5607,7 @@ useful errors on failure.") ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)+ ("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")@@ -5625,7 +5643,7 @@ to denote the expected output.") ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-octavius" ,(package-with-ocaml4.07 ocaml-octavius))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_js_style"))) (home-page "https://github.com/janestreet/ppx_js_style") (synopsis "Code style checker for Jane Street Packages")@@ -5658,7 +5676,7 @@ packages.") ("ocaml-typerep" ,ocaml4.07-typerep) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_typerep_conv"))) (home-page "https://github.com/janestreet/ppx_typerep_conv") (synopsis "Generation of runtime types from type declarations")@@ -5692,7 +5710,7 @@ from type definitions.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_base"))) (home-page "https://github.com/janestreet/ppx_base") (synopsis "Base set of ppx rewriters")@@ -5728,7 +5746,7 @@ verification tool.") ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_bin_prot"))) (home-page "https://github.com/janestreet/ppx_bin_prot") (synopsis "Generation of bin_prot readers and writers from types")@@ -5775,7 +5793,7 @@ functions from type definitions.") ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_jane"))) (home-page "https://github.com/janestreet/ppx_jane") (synopsis "Standard Jane Street ppx rewriters")@@ -5958,7 +5976,7 @@ thousands of times faster than fork. ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (home-page "https://github.com/janestreet/core") (synopsis "Alternative to OCaml's standard library") (description "The Core suite of libraries is an alternative to OCaml's-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 13/37] gnu: Add ocaml-sedlex.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-13-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-sedlex): New variable. (ocaml4.07-sedlex): Inherit from ocaml-sedlex.--- gnu/packages/ocaml.scm | 57 ++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 19 deletions(-)
Toggle diff (112 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 7848a2b3e5..f6c26b04f4 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -2555,10 +2555,10 @@ representation of the data.") and consumable.") (license license:bsd-2))) -(define-public ocaml4.07-sedlex+(define-public ocaml-sedlex (package- (name "ocaml4.07-sedlex")- (version "2.1")+ (name "ocaml-sedlex")+ (version "2.3") (source (origin (method git-fetch) (uri (git-reference@@ -2567,36 +2567,37 @@ and consumable.") (file-name (git-file-name name version)) (sha256 (base32- "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26"))))+ "0iw3phlaqr27jdf857hmj5v5hdl0vngbb2h37p2ll18sw991fxar")))) (build-system dune-build-system) (arguments- `(#:tests? #f; no tests+ `(#:tests? #f ; no tests #:package "sedlex" #:phases (modify-phases %standard-phases (add-before 'build 'copy-resources (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "src/generator/data"+ ;; Newer versions of dune emit an error if files it wants to+ ;; build already exist. Delete the dune file so dune doesn't+ ;; complain.+ (delete-file "dune") (for-each- (lambda (file)- (copy-file (assoc-ref inputs file) file))- '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt"- "PropList.txt")))+ (lambda (file)+ (copy-file (assoc-ref inputs file) file))+ '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt"+ "PropList.txt"))) #t)) (add-before 'build 'chmod (lambda _ (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*"))- #t)))- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ #t))))) (native-inputs- `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild))))+ `(("ocamlbuild" ,ocamlbuild))) (propagated-inputs- `(("ocaml-gen" ,(package-with-ocaml4.07 ocaml-gen))- ("ocaml-ppx-tools-versioned"- ,(package-with-ocaml4.07 ocaml-ppx-tools-versioned))- ("ocaml-uchar" ,(package-with-ocaml4.07 ocaml-uchar))))+ `(("ocaml-gen" ,ocaml-gen)+ ("ocaml-ppxlib" ,ocaml-ppxlib)+ ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned)+ ("ocaml-uchar" ,ocaml-uchar))) ;; These three files are needed by src/generator/data/dune, but would be ;; downloaded using curl at build time. (inputs@@ -2621,11 +2622,29 @@ and consumable.") (sha256 (base32 "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk"))))))+ (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sedlex)))) (home-page "https://www.cduce.org/download.html#side") (synopsis "Lexer generator for Unicode and OCaml") (description "Lexer generator for Unicode and OCaml.") (license license:expat))) +(define-public ocaml4.07-sedlex+ (package-with-ocaml4.07+ (package+ (inherit ocaml-sedlex)+ (name "ocaml-sedlex")+ (version "2.1")+ (source (origin+ (method git-fetch)+ (uri (git-reference+ (url "https://github.com/ocaml-community/sedlex")+ (commit (string-append "v" version))))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26"))))+ (properties '()))))+ (define-public ocaml-uchar (package (name "ocaml-uchar")@@ -3473,7 +3492,7 @@ Format module of the OCaml standard library.") `(("which" ,which))) (propagated-inputs `(("ocaml-xmlm" ,(package-with-ocaml4.07 ocaml-xmlm))- ("ocaml-sedlex" ,ocaml4.07-sedlex)+ ("ocaml-sedlex" ,(package-with-ocaml4.07 ocaml-sedlex)) ("ocaml-easy-format" ,(package-with-ocaml4.07 ocaml-easy-format)) ("ocaml-base64" ,(package-with-ocaml4.07 ocaml-base64)))) (home-page "http://piqi.org")-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 14/37] gnu: Add ocaml-uunf.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-14-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-uunf): New variable.--- gnu/packages/ocaml.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
Toggle diff (45 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex f6c26b04f4..17f953306d 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -2708,6 +2708,38 @@ Functions are also provided to fold over the characters of UTF encoded OCaml string values and to directly encode characters in OCaml Buffer.t values.") (license license:isc))) +(define-public ocaml-uunf+ (package+ (name "ocaml-uunf")+ (version "13.0.0")+ (source+ (origin+ (method url-fetch)+ (uri "https://erratique.ch/software/uunf/releases/uunf-13.0.0.tbz")+ (sha256+ (base32+ "1qci04nkp24kdls1z4s8kz5dzgky4nwd5r8345nwdrgwmxhw7ksm"))))+ (build-system ocaml-build-system)+ (arguments+ `(#:tests? #f+ #:build-flags (list "build")+ #:phases+ (modify-phases %standard-phases+ (delete 'configure))))+ (native-inputs+ `(("ocamlbuild" ,ocamlbuild)+ ("opam" ,opam)+ ("topkg" ,ocaml-topkg)))+ (propagated-inputs `(("ocaml-uutf" ,ocaml-uutf)))+ (home-page "https://erratique.ch/software/uunf")+ (synopsis "Unicode text normalization for OCaml")+ (description+ "Uunf is an OCaml library for normalizing Unicode text. It supports all+Unicode normalization forms. The library is independent from any+IO mechanism or Unicode text data structure and it can process text+without a complete in-memory representation.")+ (license license:isc)))+ (define-public ocaml-jsonm (package (name "ocaml-jsonm")-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 15/37] gnu: Add ocaml-ppx-sexp-conv.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-15-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-sexp-conv): New variable. (ocaml4.07-ppx-sexp-conv): Inherit from ocaml-ppx-sexp-conv.--- gnu/packages/ocaml.scm | 98 ++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 42 deletions(-)
Toggle diff (210 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 17f953306d..c0d5d8a92a 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -3430,7 +3430,7 @@ JSON.") #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-ounit" ,(package-with-ocaml4.07 ocaml-ounit))- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)))+ ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)))) (propagated-inputs `(("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0))@@ -5070,36 +5070,50 @@ and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-sexp-conv+(define-public ocaml-ppx-sexp-conv (package- (name "ocaml4.07-ppx-sexp-conv")- (version "0.11.2")- (source (origin- (method git-fetch)- (uri (git-reference- (url "https://github.com/janestreet/ppx_sexp_conv")- (commit (string-append "v" version))))- (file-name (git-file-name name version))- (sha256- (base32- "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9"))))+ (name "ocaml-ppx-sexp-conv")+ (version "0.14.3")+ (home-page "https://github.com/janestreet/ppx_sexp_conv")+ (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+ "0dbri9d00ydi0dw1cavswnqdmhjaaz80vap29ns2lr6mhhlvyjmj")))) (build-system dune-build-system) (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))))- (arguments- `(#:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))- (properties `((upstream-name . "ppx_sexp_conv")))- (home-page "https://github.com/janestreet/ppx_sexp_conv")+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_sexp_conv")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-conv)))) (synopsis "Generation of S-expression conversion functions from type definitions") (description "This package generates S-expression conversion functions from type definitions.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-sexp-conv+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-sexp-conv)+ (name "ocaml-ppx-sexp-conv")+ (version "0.11.2")+ (source (origin+ (method git-fetch)+ (uri (git-reference+ (url "https://github.com/janestreet/ppx_sexp_conv")+ (commit (string-append "v" version))))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9"))))+ (properties `((upstream-name . "ppx_sexp_conv"))))))+ (define-public ocaml4.07-ppx-variants-conv (package (name "ocaml4.07-ppx-variants-conv")@@ -5107,30 +5121,30 @@ definitions.") (source (origin (method git-fetch) (uri (git-reference- (url "https://github.com/janestreet/ppx_variants_conv")- (commit (string-append "v" version))))+ (url "https://github.com/janestreet/ppx_variants_conv")+ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) (build-system dune-build-system) (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-variantslib" ,ocaml4.07-variantslib)- ("ocaml-migrate-parsetree"- ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))+ `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))+ ("ocaml-variantslib" ,ocaml4.07-variantslib)+ ("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_variants_conv")))+ `((upstream-name . "ppx_variants_conv"))) (home-page- "https://github.com/janestreet/ppx_variants_conv")+ "https://github.com/janestreet/ppx_variants_conv") (synopsis "Generation of accessor and iteration functions for OCaml variant types") (description- "This package generates accessors and iteration functions for OCaml+ "This package generates accessors and iteration functions for OCaml variant types.") (license license:asl2.0))) @@ -5149,7 +5163,7 @@ variant types.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("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))))@@ -5182,7 +5196,7 @@ string conversion.") ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))))@@ -5249,7 +5263,7 @@ storage of large amounts of data.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("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))))@@ -5401,7 +5415,7 @@ many values).") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-here" ,ocaml4.07-ppx-here)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("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))))@@ -5432,7 +5446,7 @@ ocaml values.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-here" ,ocaml4.07-ppx-here)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("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))))@@ -5616,7 +5630,7 @@ position.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) ("ocaml-ppx-here" ,ocaml4.07-ppx-here)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("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))))@@ -5653,7 +5667,7 @@ useful errors on failure.") ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree"@@ -5758,7 +5772,7 @@ from type definitions.") ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("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))))@@ -6067,7 +6081,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-splittable-random" ,ocaml4.07-splittable-random)-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 16/37] gnu: Add ocaml-bigstringaf.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-16-pukkamustard@posteo.net
* gnu/ocaml/packages.scm (ocaml-bigstringaf): New variable.--- gnu/packages/ocaml.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
Toggle diff (44 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex c0d5d8a92a..b979dbd029 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -6579,3 +6579,37 @@ provides support to program with time varying values: declarative events and signals. React doesn't define any primitive event or signal, it lets the client chooses the concrete timeline.") (license license:lgpl2.1+)))++(define-public ocaml-bigstringaf+ (package+ (name "ocaml-bigstringaf")+ (version "0.7.0")+ (home-page "https://github.com/inhabitedtype/bigstringaf")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url home-page)+ (commit version)))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "1q1sqxzdnlrpl95ccrhl7lwy3zswgd9rbn19ildclh0lyi2vazbj"))))+ (build-system dune-build-system)+ (arguments+ '(#:test-target "."))+ (propagated-inputs+ `(("ocaml-bigarray-compat" ,ocaml-bigarray-compat)))+ (native-inputs+ `(("ocaml-alcotest" ,ocaml-alcotest)+ ("pkg-config" ,pkg-config)))+ (synopsis+ "Bigstring intrinsics and fast blits based on memcpy/memmove")+ (description+ "The OCaml compiler has a bunch of intrinsics for Bigstrings, but they're+not widely-known, sometimes misused, and so programs that use Bigstrings are+slower than they have to be. And even if a library got that part right and+exposed the intrinsics properly, the compiler doesn't have any fast blits+between Bigstrings and other string-like types. @code{bigstringaf} provides+these missing pieces.")+ (license license:bsd-3)))-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 23/37] gnu: Add ocaml-ppx-custom-printf.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-23-pukkamustard@posteo.net
* 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(-)
Toggle diff (101 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 7f3599bd3a..ae6f393130 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
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 24/37] gnu: Add ocaml-ppx-hash.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-24-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-hash): New variable. (ocaml4.07-ppx-hash): Inherit from ocaml-ppx-hash.--- gnu/packages/ocaml.scm | 72 +++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 32 deletions(-)
Toggle diff (125 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex ae6f393130..fd85e2614e 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5267,38 +5267,46 @@ storage of large amounts of data.") (description "Octavius is a library to parse the `ocamldoc` comment syntax.") (license license:isc))) -(define-public ocaml4.07-ppx-hash+(define-public ocaml-ppx-hash (package- (name "ocaml4.07-ppx-hash")- (version "0.11.1")- (source (origin- (method git-fetch)- (uri (git-reference- (url "https://github.com/janestreet/ppx_hash")- (commit (string-append "v" version))))- (file-name (git-file-name name version))- (sha256- (base32- "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p"))))+ (name "ocaml-ppx-hash")+ (version "0.14.0")+ (source+ (janestreet-origin "ppx_hash" version+ "0x4wgdvhgd8a49bzari52jpkykxpv6ncgp5ncda3xgg0a9r49s8n")) (build-system dune-build-system) (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare))- ("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_hash")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-ppx-compare" ,ocaml-ppx-compare)+ ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_hash")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-hash)))) (home-page "https://github.com/janestreet/ppx_hash") (synopsis "Generation of hash functions from type expressions and definitions") (description "This package is a collection of ppx rewriters that generate hash functions from type exrpessions and definitions.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-hash+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-hash)+ (name "ocaml-ppx-hash")+ (home-page "https://github.com/janestreet/ppx_hash")+ (version "0.11.1")+ (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+ "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p"))))+ (properties `((upstream-name . "ppx_hash"))))))+ (define-public ocaml4.07-ppx-enumerate (package (name "ocaml4.07-ppx-enumerate")@@ -5306,23 +5314,23 @@ hash functions from type exrpessions and definitions.") (source (origin (method git-fetch) (uri (git-reference- (url "https://github.com/janestreet/ppx_enumerate")- (commit (string-append "v" version))))+ (url "https://github.com/janestreet/ppx_enumerate")+ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) (build-system dune-build-system) (arguments- `(#:tests? #f; no test suite+ `(#:tests? #f ; no test suite #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (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))))+ `(("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_enumerate"))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type")@@ -5826,7 +5834,7 @@ from type definitions.") (propagated-inputs `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate)- ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash)+ ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree"@@ -6134,7 +6142,7 @@ standard library that was developed by Jane Street.") ("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-hash" ,ocaml4.07-ppx-hash)+ ("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) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 18/37] gnu: Add ocaml-syntax-shims.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-18-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-syntax-shims): New variable.--- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
Toggle diff (35 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 0658b7ef68..e5b304fa81 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -6615,3 +6615,28 @@ exposed the intrinsics properly, the compiler doesn't have any fast blits between Bigstrings and other string-like types. @code{bigstringaf} provides these missing pieces.") (license license:bsd-3)))++(define-public ocaml-syntax-shims+ (package+ (name "ocaml-syntax-shims")+ (version "1.0.0")+ (home-page "https://github.com/ocaml-ppx/ocaml-syntax-shims")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url home-page)+ (commit version)))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "0l1i8z95qgb0lxlrv3yb5nkp391hqsiyi4r91p12k3xmggqixagf"))))+ (build-system dune-build-system)+ (properties+ `((upstream-name . "ocaml-syntax-shims")))+ (synopsis+ "Backport new syntax to older OCaml versions")+ (description+ "This packages backports new features of the language to older+compilers, such as let+.")+ (license license:expat)))-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 17/37] gnu: Add ocaml-ppx-let.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-17-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-let): New variable. (ocaml4.07-ppx-let): Inherit from ocaml-ppx-let.--- gnu/packages/ocaml.scm | 44 ++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-)
Toggle diff (73 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex b979dbd029..0658b7ef68 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5550,35 +5550,37 @@ used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, ...") (license license:asl2.0))) -(define-public ocaml4.07-ppx-let+(define-public ocaml-ppx-let (package- (name "ocaml4.07-ppx-let")- (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_let-v" version ".tar.gz"))- (sha256- (base32- "1wdfw6w4xbg97a35yg6bif9gggxniy9ddnrjfw1a0inkl2yamxkj"))))+ (name "ocaml-ppx-let")+ (version "0.14.0")+ (source+ (janestreet-origin "ppx_let" version+ "1qcrnd86pbr1di5m6z4ps4p15qawwa02jxwz3xfd82hdbjmdwf1s")) (build-system dune-build-system)- (arguments- `(#:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune)) (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_let")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_let")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-let)))) (home-page "https://github.com/janestreet/ppx_let") (synopsis "Monadic let-bindings") (description "A ppx rewriter for monadic and applicative let bindings, match expressions, and if expressions.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-let+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-let)+ (version "0.11.0")+ (source+ (janestreet-origin "ppx_let" version+ "1wdfw6w4xbg97a35yg6bif9gggxniy9ddnrjfw1a0inkl2yamxkj"))++ (properties `(upstream-name . "ppx_let")))))+ (define-public ocaml4.07-ppx-fail (package (name "ocaml4.07-ppx-fail")@@ -5848,7 +5850,7 @@ functions from type definitions.") ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)- ("ocaml-ppx-let" ,ocaml4.07-ppx-let)+ ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,ocaml4.07-ppx-optcomp) ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional) ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang)-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 19/37] gnu: Add ocaml-ppx-compare.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-19-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-compare): New variable. (ocaml4.07-ppx-compare): Inherit from ocaml-ppx-compare.--- gnu/packages/ocaml.scm | 64 +++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 26 deletions(-)
Toggle diff (122 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex e5b304fa81..271627ff1b 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4941,30 +4941,24 @@ OCaml AST in the OCaml syntax; #t))))) (properties '())))) -(define-public ocaml4.07-ppx-compare+(define-public ocaml-ppx-compare (package- (name "ocaml4.07-ppx-compare")- (version "0.11.1")- (source (origin- (method git-fetch)- (uri (git-reference- (url "https://github.com/janestreet/ppx_compare")- (commit (string-append "v" version))))- (file-name (git-file-name name version))- (sha256- (base32- "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m"))))+ (name "ocaml-ppx-compare")+ (version "0.14.0")+ (source+ (janestreet-origin "ppx_compare" version+ "0mqxa2s194nif7x4fjn1p5gd9i3bakr8nv27gf8x1g5nmi8q9pmp")) (build-system dune-build-system)- (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)))) (arguments- `(#:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))- (properties `((upstream-name . "ppx_compare")))+ ;; Tests are currenlty failing+ ;; (see https://github.com/janestreet/ppx_compare/issues/10)+ '(#:tests? #f))+ (propagated-inputs+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_compare")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-compare)))) (home-page "https://github.com/janestreet/ppx_compare") (synopsis "Generation of comparison functions from types") (description "Generation of fast comparison functions from type expressions@@ -4975,6 +4969,24 @@ flexibility by allowing you to override them for a specific type and more safety by making sure that you only compare comparable values.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-compare+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-compare)+ (name "ocaml-ppx-compare")+ (version "0.11.1")+ (home-page "https://github.com/janestreet/ppx_compare")+ (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+ "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m"))))+ (properties `((upstream-name . "ppx_compare"))))))+ (define-public ocaml4.07-fieldslib (package (name "ocaml4.07-fieldslib")@@ -5193,7 +5205,7 @@ string conversion.") (build-system dune-build-system) (inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare)+ ("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-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))@@ -5262,7 +5274,7 @@ storage of large amounts of data.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare)+ ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))@@ -5630,7 +5642,7 @@ position.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare)+ ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree"@@ -5664,7 +5676,7 @@ useful errors on failure.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert)- ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare)+ ("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)@@ -5770,7 +5782,7 @@ from type definitions.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs- `(("ocaml-ppx-compare" ,ocaml4.07-ppx-compare)+ `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style)-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 26/37] gnu: Add ocaml-ppx-js-style.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-26-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-js-style): New variable. (ocaml4.07-ppx-js-style): Inherit from ocaml-ppx-js-style.--- gnu/packages/ocaml.scm | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-)
Toggle diff (78 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 0e2b632ae2..1fb620faa6 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5758,32 +5758,22 @@ output-generating code, interleaved with @code{%expect} extension expressions to denote the expected output.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-js-style+(define-public ocaml-ppx-js-style (package- (name "ocaml4.07-ppx-js-style")- (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_js_style-v" version ".tar.gz"))- (sha256- (base32- "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2"))))+ (name "ocaml-ppx-js-style")+ (version "0.14.0")+ (source+ (janestreet-origin "ppx_js_style" version+ "141fgxfipfn5jdaxc946dmp5y4fcnbhxms9maji9ddywgx82ya7l")) (build-system dune-build-system)- (arguments- ;; No tests- `(#:tests? #f- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ (arguments `(#:tests? #f)) ; No tests (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-migrate-parsetree"- ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-octavius" ,(package-with-ocaml4.07 ocaml-octavius))- ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))- (properties `((upstream-name . "ppx_js_style")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-octavius" ,ocaml-octavius)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_js_style")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-js-style)))) (home-page "https://github.com/janestreet/ppx_js_style") (synopsis "Code style checker for Jane Street Packages") (description "This package is a no-op ppx rewriter. It is used as a@@ -5791,6 +5781,16 @@ to denote the expected output.") packages.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-js-style+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-js-style)+ (version "0.11.0")+ (source+ (janestreet-origin "ppx_js_style" version+ "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2"))+ (properties `((upstream-name . "ppx_js_style"))))))+ (define-public ocaml4.07-ppx-typerep-conv (package (name "ocaml4.07-ppx-typerep-conv")@@ -5845,7 +5845,7 @@ from type definitions.") `(("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" ,ocaml4.07-ppx-js-style)+ ("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))-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 21/37] gnu: Add ocaml-ppx-cold.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-21-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-cold): New variable.--- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
Toggle diff (35 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 27a985f9b6..193a9fcc58 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5625,6 +5625,28 @@ match expressions, and if expressions.") position.") (license license:asl2.0))) +(define-public ocaml-ppx-cold+ (package+ (name "ocaml-ppx-cold")+ (version "0.14.0")+ (home-page "https://github.com/janestreet/ppx_cold")+ (source+ (janestreet-origin "ppx_cold" version+ "1madfzhpir9amnxmg530n70vll0jrl59vyp71miji73i6b9sy6n2"))+ (build-system dune-build-system)+ (arguments `(#:test-target "tests"))+ (propagated-inputs+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_cold")))+ (synopsis "Syntax extension for indicating cold path")+ (description+ "This package contains an syntax extension to indicate that the code is+on the cold path and should be kept out of the way to avoid polluting the+instruction cache on the hot path. See also+https://github.com/ocaml/ocaml/issues/8563.")+ (license license:expat)))+ (define-public ocaml4.07-ppx-assert (package (name "ocaml4.07-ppx-assert")-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 22/37] gnu: Add ocaml-ppx-assert.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-22-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-assert): New variable. (ocaml4.07-ppx-assert): Inherit from ocaml-ppx-assert.--- gnu/packages/ocaml.scm | 63 ++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 27 deletions(-)
Toggle diff (113 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 193a9fcc58..7f3599bd3a 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5647,38 +5647,47 @@ instruction cache on the hot path. See also https://github.com/ocaml/ocaml/issues/8563.") (license license:expat))) -(define-public ocaml4.07-ppx-assert+(define-public ocaml-ppx-assert (package- (name "ocaml4.07-ppx-assert")- (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_assert-v" version ".tar.gz"))- (sha256- (base32- "17kd311n0l9f72gblf9kv8i5rghr106w37x4f0m5qwh6nlgl0j9k"))))+ (name "ocaml-ppx-assert")+ (version "0.14.0")+ (source+ (janestreet-origin "ppx_assert" version+ "1l2rr4jz2q5b35ryn2z146z7m9v6k8krp5gpn8ilib66mnz5zx15")) (build-system dune-build-system)- (arguments- `(#:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune)) (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare))- ("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))- ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))- (properties `((upstream-name . "ppx_assert")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-ppx-cold" ,ocaml-ppx-cold)+ ("ocaml-ppx-compare" ,ocaml-ppx-compare)+ ("ocaml-ppx-here" ,ocaml-ppx-here)+ ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_assert")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-assert)))) (home-page "https://github.com/janestreet/ppx_assert") (synopsis "Assert-like extension nodes that raise useful errors on failure") (description "This package contains assert-like extension nodes that raise useful errors on failure.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-assert+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-assert)+ (version "0.11.0")+ (source+ (janestreet-origin "ppx_assert" version+ "17kd311n0l9f72gblf9kv8i5rghr106w37x4f0m5qwh6nlgl0j9k"))+ (propagated-inputs+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-ppx-compare" ,ocaml-ppx-compare)+ ("ocaml-ppx-here" ,ocaml-ppx-here)+ ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_assert"))))))+ (define-public ocaml4.07-ppx-expect (package (name "ocaml4.07-ppx-expect")@@ -5699,7 +5708,7 @@ useful errors on failure.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert)+ ("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-fields-conv" ,ocaml4.07-ppx-fields-conv)@@ -5876,7 +5885,7 @@ functions from type definitions.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs- `(("ocaml-ppx-assert" ,ocaml4.07-ppx-assert)+ `(("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot)@@ -6072,7 +6081,7 @@ thousands of times faster than fork. `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-configurator" ,ocaml4.07-configurator) ("ocaml-core-kernel" ,ocaml4.07-core-kernel)- ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert)+ ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-spawn" ,ocaml4.07-spawn)@@ -6114,7 +6123,7 @@ standard library that was developed by Jane Street.") ("ocaml-configurator" ,ocaml4.07-configurator) ("ocaml-fieldslib" ,ocaml4.07-fieldslib) ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers)- ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert)+ ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 28/37] gnu: Add ocaml-fieldslib.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-28-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-fieldslib): New variable. (ocaml4.07-fieldslib): Inherit from ocaml-fieldslib.--- gnu/packages/ocaml.scm | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-)
Toggle diff (85 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex b4640037f5..6415e27ff9 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4987,31 +4987,21 @@ by making sure that you only compare comparable values.") "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m")))) (properties `((upstream-name . "ppx_compare")))))) -(define-public ocaml4.07-fieldslib+(define-public ocaml-fieldslib (package- (name "ocaml4.07-fieldslib")- (version "0.11.0")- (source (origin- (method url-fetch)- (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v"- (version-major+minor version) "/files/"- "fieldslib-v" version ".tar.gz"))- (sha256- (base32- "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388"))))+ (name "ocaml-fieldslib")+ (version "0.14.0")+ (source (janestreet-origin+ "fieldslib" version+ "10n5y376fb5jgqk9h8vq158rm1b36h9lzh6p11q33h6xgvb1v6n3")) (build-system dune-build-system)- (arguments- ;; No tests- `(#:tests? #f- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ (arguments `(#:tests? #f)) ; No tests (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 . "fieldslib")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "fieldslib")+ (ocaml4.07-variant . ,(delay ocaml4.07-fieldslib)))) (home-page "https://github.com/janestreet/fieldslib") (synopsis "Syntax extension to record fields") (description "Syntax extension to define first class values representing@@ -5019,6 +5009,16 @@ record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) +(define-public ocaml4.07-fieldslib+ (package-with-ocaml4.07+ (package+ (inherit ocaml-fieldslib)+ (version "0.11.0")+ (source (janestreet-origin+ "fieldslib" version+ "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388"))+ (properties `((upstream-name . "fieldslib"))))))+ (define-public ocaml4.07-variantslib (package (name "ocaml4.07-variantslib")@@ -5065,7 +5065,7 @@ standard library.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-fieldslib" ,ocaml4.07-fieldslib)+ ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))@@ -6161,7 +6161,7 @@ standard library that was developed by Jane Street.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-bin-prot" ,ocaml4.07-bin-prot) ("ocaml-configurator" ,ocaml4.07-configurator)- ("ocaml-fieldslib" ,ocaml4.07-fieldslib)+ ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base))-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 32/37] gnu: Add ocaml-jst-config.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-32-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-jst-config): New variable.--- gnu/packages/ocaml.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
Toggle diff (46 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 515cc3984c..db6c851186 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4128,6 +4128,30 @@ Dedukti files.") syntax checking on dedukti files.") (license license:cecill-b)))) +(define-public ocaml-jst-config+ (package+ (name "ocaml-jst-config")+ (version "0.14.0")+ (source+ (janestreet-origin+ "jst-config" version+ "1fppr29vn91zpqda8jlnp8bcssd4bf3rn36ig8fnd1yhjrsvz8f6"))+ (build-system dune-build-system)+ (arguments '(#:tests? #f)) ; no tests+ (propagated-inputs+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-ppx-assert" ,ocaml-ppx-assert)+ ("ocaml-stdio" ,ocaml-stdio)+ ("dune-configurator" ,dune-configurator)))+ (home-page "https://github.com/janestreet/jst-config")+ (synopsis "Compile-time configuration for Jane Street libraries")+ (description "Defines compile-time constants used in Jane Street libraries+such as Base, Core, and Async. This package has an unstable interface; it is+intended only to share configuration between different packages from Jane+Street. Future updates may not be backward-compatible, and we do not+recommend using this package directly.")+ (license license:expat)))+ (define-public ocaml4.07-ppx-inline-test (package (name "ocaml4.07-ppx-inline-test")@@ -4145,7 +4169,7 @@ syntax checking on dedukti files.") "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50")))) (build-system dune-build-system) (arguments- ;see home page README for further information+ ;see home page README for further information `(#:tests? #f #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 25/37] gnu: Add ocaml-ppx-enumerate.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-25-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-enumerate): New variable. (ocaml4.07-ppx-enumerate): Inherit from ocaml-ppx-enumerate.--- gnu/packages/ocaml.scm | 54 +++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 22 deletions(-)
Toggle diff (85 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex fd85e2614e..0e2b632ae2 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5307,31 +5307,23 @@ hash functions from type exrpessions and definitions.") "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) (properties `((upstream-name . "ppx_hash")))))) -(define-public ocaml4.07-ppx-enumerate+(define-public ocaml-ppx-enumerate (package- (name "ocaml4.07-ppx-enumerate")- (version "0.11.1")- (source (origin- (method git-fetch)- (uri (git-reference- (url "https://github.com/janestreet/ppx_enumerate")- (commit (string-append "v" version))))- (file-name (git-file-name name version))- (sha256- (base32- "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr"))))+ (name "ocaml-ppx-enumerate")+ (version "0.14.0")+ (source+ (janestreet-origin+ "ppx_enumerate" version+ "1ij6sffgqhnjwnj9brhrrw1c6xgxlh0s6r17x1qkgnyrc73gfsz8")) (build-system dune-build-system) (arguments- `(#:tests? #f ; no test suite- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ `(#:tests? #f)) ; no test suite (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_enumerate")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_enumerate")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-enumerate)))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type") (description "Ppx_enumerate is a ppx rewriter which generates a definition@@ -5339,6 +5331,24 @@ for the list of all values of a type (for a type which only has finitely many values).") (license license:asl2.0))) +(define-public ocaml4.07-ppx-enumerate+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-enumerate)+ (name "ocaml-ppx-enumerate")+ (version "0.11.1")+ (home-page "https://github.com/janestreet/ppx_enumerate")+ (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+ "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr"))))+ (properties `((upstream-name . "ppx_enumerate"))))))+ (define-public ocaml4.07-ppx-bench (package (name "ocaml4.07-ppx-bench")@@ -5833,7 +5843,7 @@ from type definitions.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare))- ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate)+ ("ocaml-ppx-enumerate" ,(package-with-ocaml4.07 ocaml-ppx-enumerate)) ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 27/37] gnu: Add ocaml-ppx-base.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-27-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-base): New variable. (ocaml4.07-ppx-base): Inherit from ocaml-ppx-base.--- gnu/packages/ocaml.scm | 65 +++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 26 deletions(-)
Toggle diff (103 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 1fb620faa6..b4640037f5 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5823,34 +5823,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.@@ -5859,6 +5853,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")@@ -5913,7 +5926,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))@@ -6151,7 +6164,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)-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 20/37] gnu: Add ocaml-ppx-here.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-20-pukkamustard@posteo.net
* 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(-)
Toggle diff (129 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 271627ff1b..27a985f9b6 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5352,37 +5352,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")@@ -5426,7 +5428,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))@@ -5457,7 +5459,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))@@ -5612,7 +5614,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))))@@ -5643,7 +5645,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))@@ -5679,7 +5681,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)@@ -5822,7 +5824,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))))@@ -5860,7 +5862,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
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 30/37] gnu: Add ocaml-ppx-optcomp
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-30-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-optcomp): New variable. (ocaml4.07-ppx-optcomp): Inherit from ocaml-ppx-optcomp.--- gnu/packages/ocaml.scm | 52 +++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 21 deletions(-)
Toggle diff (81 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 66cec49a79..77827e6ece 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5570,35 +5570,45 @@ context such as function arguments.") else expression.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-optcomp+(define-public ocaml-ppx-optcomp (package- (name "ocaml4.07-ppx-optcomp")- (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_optcomp-v" version ".tar.gz"))- (sha256- (base32- "1bb52p2j2h4s9f06vrcpla80rj93jinnzq6jzilapyx9q068929i"))))+ (name "ocaml-ppx-optcomp")+ (version "0.14.1")+ (home-page "https://github.com/janestreet/ppx_optcomp")+ (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+ "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4")))) (build-system dune-build-system)- (arguments- `(#:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune)) (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio))- ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))- (properties `((upstream-name . "ppx_optcomp")))- (home-page "https://github.com/janestreet/ppx_optcomp")+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-stdio" ,ocaml-stdio)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_optcomp")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-optcomp)))) (synopsis "Optional compilation for OCaml") (description "Ppx_optcomp stands for Optional Compilation. It is a tool used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, ...") (license license:asl2.0))) +(define-public ocaml4.07-ppx-optcomp+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-optcomp)+ (version "0.11.0")+ (source+ (janestreet-origin+ "ppx_optcomp" version+ "1bb52p2j2h4s9f06vrcpla80rj93jinnzq6jzilapyx9q068929i"))+ (properties `((upstream-name . "ppx_optcomp"))))))+ (define-public ocaml-ppx-let (package (name "ocaml-ppx-let")@@ -5944,7 +5954,7 @@ functions from type definitions.") ("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)+ ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional) ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message)-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:13 +0200
[PATCH 34/37] gnu: Add ocaml-time-now.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-34-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-time-now): New variable.--- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
Toggle diff (38 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 60bcc0568d..ade6083e16 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4168,6 +4168,31 @@ recommend using this package directly.") packages.") (license license:expat))) +(define-public ocaml-time-now+ (package+ (name "ocaml-time-now")+ (version "0.14.0")+ (source+ (janestreet-origin+ "time_now" version+ "0hkn2jw4dz5gflnsblskl5wp6z7zbrahwjmaxmsskfviwjg82cqh"))+ (build-system dune-build-system)+ (arguments '(#:tests? #f)) ; no tests+ (propagated-inputs+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-jane-street-headers" ,ocaml-jane-street-headers)+ ("ocaml-jst-config" ,ocaml-jst-config)+ ("ocaml-ppx-base" ,ocaml-ppx-base)+ ("ocaml-ppx-optcomp" ,ocaml-ppx-optcomp)))+ (properties `((upstream-name . "time_now")))+ (home-page+ "https://github.com/janestreet/time_now")+ (synopsis "Reports the current time")+ (description+ "Provides a single function to report the current time in nanoseconds+since the start of the Unix epoch.")+ (license license:expat)))+ (define-public ocaml4.07-ppx-inline-test (package (name "ocaml4.07-ppx-inline-test")-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 31/37] gnu: Add ocaml-ppx-optional.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-31-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-optional): New variable. (ocaml4.07-ppx-optional): Inherit from ocaml-ppx-optional.--- gnu/packages/ocaml.scm | 48 ++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 23 deletions(-)
Toggle diff (78 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 77827e6ece..515cc3984c 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5538,31 +5538,22 @@ context such as function arguments.") @code{|>} and @code{|!}.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-optional+(define-public ocaml-ppx-optional (package- (name "ocaml4.07-ppx-optional")- (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_optional-v" version ".tar.gz"))- (sha256- (base32- "1z8z2bga95k2vksljljfglg10vygkjd24kn1b37sk4z3nmp47x0h"))))+ (name "ocaml-ppx-optional")+ (version "0.14.0")+ (source+ (janestreet-origin+ "ppx_optional" version+ "1hh6ivlp1qpvyn8l0vhrahkkcp3scf7km254sgplprmk10wnyidz")) (build-system dune-build-system)- (arguments- ;; No tests- `(#:tests? #f- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ (arguments `(#:tests? #f)) ; No tests (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_optional")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_optional")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-optional)))) (home-page "https://github.com/janestreet/ppx_optional") (synopsis "Pattern matching on flat options") (description@@ -5570,6 +5561,17 @@ context such as function arguments.") else expression.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-optional+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-optional)+ (version "0.11.0")+ (source+ (janestreet-origin+ "ppx_optional" version+ "1z8z2bga95k2vksljljfglg10vygkjd24kn1b37sk4z3nmp47x0h"))+ (properties `((upstream-name . "ppx_optional"))))))+ (define-public ocaml-ppx-optcomp (package (name "ocaml-ppx-optcomp")@@ -5955,7 +5957,7 @@ functions from type definitions.") ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp))- ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional)+ ("ocaml-ppx-optional" ,(package-with-ocaml4.07 ocaml-ppx-optional)) ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value)-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 33/37] gnu: Add ocaml-jane-street-headers.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-33-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-jane-street-headers): New variable.--- gnu/packages/ocaml.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
Toggle diff (29 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex db6c851186..60bcc0568d 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4152,6 +4152,22 @@ Street. Future updates may not be backward-compatible, and we do not recommend using this package directly.") (license license:expat))) +(define-public ocaml-jane-street-headers+ (package+ (name "ocaml-jane-street-headers")+ (version "0.14.0")+ (source+ (janestreet-origin+ "jane-street-headers" version+ "028yxb4h3iy025iy89v8653m5brh7flrjshghs4x99pd690pmfs7"))+ (build-system dune-build-system)+ (arguments '(#:tests? #f)) ; no tests+ (home-page "https://github.com/janestreet/jane-street-headers")+ (synopsis "Jane Street C header files")+ (description "C header files shared between the various Jane Street+packages.")+ (license license:expat)))+ (define-public ocaml4.07-ppx-inline-test (package (name "ocaml4.07-ppx-inline-test")-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:13 +0200
[PATCH 36/37] gnu: Add ocaml-angstrom.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-36-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-angstrom): New variable.--- gnu/packages/ocaml.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
Toggle diff (47 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 9c457d550d..bd01cf1310 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -6833,3 +6833,40 @@ these missing pieces.") "This packages backports new features of the language to older compilers, such as let+.") (license license:expat)))++(define-public ocaml-angstrom+ (package+ (name "ocaml-angstrom")+ (version "0.15.0")+ (home-page "https://github.com/inhabitedtype/angstrom")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url home-page)+ (commit version)))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh"))))+ (build-system dune-build-system)+ (arguments+ ;; Only build the base angstrom package.+ '(#:package "angstrom"+ #:test-target "."))+ (propagated-inputs+ `(("ocaml-bigstringaf" ,ocaml-bigstringaf)))+ (native-inputs+ `(("ocaml-alcotest" ,ocaml-alcotest)+ ("ocaml-ppx-let" ,ocaml-ppx-let)+ ("ocaml-syntax-shims" ,ocaml-syntax-shims)))+ (synopsis "Parser combinators built for speed and memory-efficiency")+ (description+ "Angstrom is a parser-combinator library that makes it easy to write+efficient, expressive, and reusable parsers suitable for high-performance+applications. It exposes monadic and applicative interfaces for composition,+and supports incremental input through buffered and unbuffered interfaces.+Both interfaces give the user total control over the blocking behavior of+their application, with the unbuffered interface enabling zero-copy IO.+Parsers are backtracking by default and support unbounded lookahead.")+ (license license:bsd-3)))-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:13 +0200
[PATCH 35/37] gnu: Add ocaml-ppx-inline-test.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-35-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-inline-test): New variable. (ocaml4.07-ppx-inline-test): Inherit from ocaml-ppx-inline-test.--- gnu/packages/ocaml.scm | 69 ++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 23 deletions(-)
Toggle diff (133 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex ade6083e16..9c457d550d 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4193,10 +4193,10 @@ packages.") since the start of the Unix epoch.") (license license:expat))) -(define-public ocaml4.07-ppx-inline-test+(define-public ocaml-ppx-inline-test (package- (name "ocaml4.07-ppx-inline-test")- (version "0.12.0")+ (name "ocaml-ppx-inline-test")+ (version "0.14.1") (home-page "https://github.com/janestreet/ppx_inline_test") (source (origin@@ -4207,29 +4207,52 @@ since the start of the Unix epoch.") (file-name (git-file-name name version)) (sha256 (base32- "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50"))))+ "1ajdna1m9l1l3nfigyy33zkfa3yarfr6s086jdw2pcfwlq1fhhl4")))) (build-system dune-build-system) (arguments- ;see home page README for further information- `(#:tests? #f- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))- (inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-migrate-parsetree"- ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("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" ,(package-with-ocaml4.07 ocaml-ppxlib))))- (properties `((upstream-name . "ppx_inline_test")))+ `(#:tests? #f)) ;see home page README for further information+ (propagated-inputs+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-compiler-libs" ,ocaml-compiler-libs)+ ("ocaml-sexplib0" ,ocaml-sexplib0)+ ("ocaml-stdio" ,ocaml-stdio)+ ("ocaml-ppxlib" ,ocaml-ppxlib)+ ("ocaml-time-now" ,ocaml-time-now)))+ (properties `((upstream-name . "ppx_inline_test")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-inline-test)))) (synopsis "Syntax extension for writing in-line tests in ocaml code") (description "This package contains a syntax extension for writing in-line tests in ocaml code. It is part of Jane Street's PPX rewriters collection.") (license license:expat))) +(define-public ocaml4.07-ppx-inline-test+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-inline-test)+ (name "ocaml-ppx-inline-test")+ (version "0.12.0")+ (home-page "https://github.com/janestreet/ppx_inline_test")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url (string-append home-page ".git"))+ (commit (string-append "v" version))))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50"))))+ (propagated-inputs+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-compiler-libs" ,ocaml-compiler-libs)+ ("ocaml-sexplib0" ,ocaml-sexplib0)+ ("ocaml-stdio" ,ocaml-stdio)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_inline_test"))))))+ (define-public ocaml-bindlib (package (name "ocaml-bindlib")@@ -4246,7 +4269,7 @@ collection.") "1f8kr81w8vsi4gv61xn1qbc6zrzkjp8l9ix0942vjh4gjxc74v75")))) (build-system ocaml-build-system) (arguments- `(#:tests? #f ;no tests+ `(#:tests? #f ;no tests #:use-make? #t #:phases (modify-phases %standard-phases@@ -5442,7 +5465,7 @@ many values).") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs- `(("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)+ `(("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))@@ -5825,7 +5848,7 @@ useful errors on failure.") ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here))- ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)+ ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio))@@ -6019,7 +6042,7 @@ functions from type definitions.") ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here))- ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)+ ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) ("ocaml-ppx-optional" ,(package-with-ocaml4.07 ocaml-ppx-optional))@@ -6251,7 +6274,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("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-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message)-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:13 +0200
[PATCH 37/37] gnu: Add ocaml-uri.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-37-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-uri): New variable.--- gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
Toggle diff (50 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex bd01cf1310..e1003b7e08 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -3403,6 +3403,35 @@ the need to write signal code, which is useful for quick scripts that manipulate JSON.") (license license:isc))) +(define-public ocaml-uri+ (package+ (name "ocaml-uri")+ (version "4.1.0")+ (home-page "https://github.com/mirage/ocaml-uri")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url home-page)+ (commit (string-append "v" version))))+ (sha256+ (base32+ "10bf28my1yhj8a2d7bkgbna9j20wq0ghp92k926y29bmjj2qh0l7"))))+ (build-system dune-build-system)+ (arguments '(#:package "uri"+ #:test-target "."))+ (propagated-inputs+ `(("ocaml-stringext" ,ocaml-stringext)+ ("ocaml-angstrom" ,ocaml-angstrom)))+ (native-inputs+ `(("ocaml-ounit" ,ocaml-ounit)+ ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)))+ (properties `((upstream-name . "uri")+ (ocaml4.07-variant ,(delay ocaml4.07-uri))))+ (synopsis "RFC3986 URI/URL parsing library")+ (description "OCaml-uri is a library for parsing URI/URL in the RFC3986 format.")+ (license license:isc)))+ (define-public ocaml4.07-uri (package (name "ocaml4.07-uri")@@ -3435,6 +3464,7 @@ JSON.") `(("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) ("ocaml-stringext" ,(package-with-ocaml4.07 ocaml-stringext))))+ (properties `((upstream-name . "uri"))) (home-page "https://github.com/mirage/ocaml-uri") (synopsis "RFC3986 URI/URL parsing library") (description "OCaml-uri is a library for parsing URI/URL in the RFC3986 format.")-- 2.31.1
P
P
pukkamustard wrote on 14 Apr 11:12 +0200
[PATCH 29/37] gnu: Add ocaml-ppx-fields-conv.
(address . 47768@debbugs.gnu.org)(name . pukkamustard)(address . pukkamustard@posteo.net)
20210414091303.6990-29-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-fields-conv): New variable. (ocaml4.07-ppx-fields-conv): Inherit from ocaml-ppx-fields-conv.--- gnu/packages/ocaml.scm | 58 ++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 25 deletions(-)
Toggle diff (102 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 6415e27ff9..66cec49a79 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5050,31 +5050,29 @@ of a record and create new record values.") standard library.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-fields-conv+(define-public ocaml-ppx-fields-conv (package- (name "ocaml4.07-ppx-fields-conv")- (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_fields_conv-v" version ".tar.gz"))- (sha256- (base32- "07zrd3qky2ppbfl55gpm90rvqa5860xgwcsvihrjmkrw6d0jirkc"))))+ (name "ocaml-ppx-fields-conv")+ (version "0.14.2")+ (home-page "https://github.com/janestreet/ppx_fields_conv")+ (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+ "1zwirwqry24b48bg7d4yc845hvcirxyymzbw95aaxdcck84d30n8")))) (build-system dune-build-system) (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib))- ("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_fields_conv")))- (home-page "https://github.com/janestreet/ppx_fields_conv")+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-fieldslib" ,ocaml-fieldslib)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_fields_conv")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-fields-conv)))) (synopsis "Generation of accessor and iteration functions for ocaml records") (description "Ppx_fields_conv is a ppx rewriter that can be used to define first class values representing record fields, and additional routines, to get@@ -5082,6 +5080,16 @@ and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-fields-conv+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-fields-conv)+ (version "0.11.0")+ (source (janestreet-origin+ "ppx_fields_conv" version+ "07zrd3qky2ppbfl55gpm90rvqa5860xgwcsvihrjmkrw6d0jirkc"))+ (properties `((upstream-name . "ppx_fields_conv"))))))+ (define-public ocaml-ppx-sexp-conv (package (name "ocaml-ppx-sexp-conv")@@ -5216,7 +5224,7 @@ string conversion.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf))- ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv)+ ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-migrate-parsetree"@@ -5738,7 +5746,7 @@ useful errors on failure.") ("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" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf))- ("ocaml-ppx-fields-conv" ,ocaml4.07-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-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))@@ -5932,7 +5940,7 @@ functions from type definitions.") ("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)+ ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("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))-- 2.31.1
M
M
Maxime Devos wrote on 14 Apr 20:50 +0200
Re: [bug#47768] [PATCH 04/37] gnu: ocaml-lwt: Make libev a propagated input.
1043b7177b01f6708c742851b36e351141c1a70a.camel@telenet.be
On Wed, 2021-04-14 at 11:12 +0200, pukkamustard wrote:
Toggle quote (5 lines)> * gnu/packages/ocaml.scm (ocaml-lwt) [propagated-inputs]: Add libev.> [inputs]: Remove libev.> (ocaml-ouint2, ocaml4.07-lambda-term, ocaml-markup) [inputs]: Remove libev.> ---
What's the reason libev has been moved from inputs to propagated-inputs?
Note: I know practically nothing about ocaml packaging.
Greetings,Maxime.
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYHc5kBccbWF4aW1lZGV2b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7lxWAP4hFuY4UXUxUrA/xchkPFtyVV4LNh79pnYRNKv7ncvprAEAsa9H/vvqCe912I0zHqP76Eo94IVMAas1vaBZSDA3ZwY==VJuf-----END PGP SIGNATURE-----

M
M
Maxime Devos wrote on 14 Apr 20:54 +0200
Re: [bug#47768] [PATCH 07/37] gnu: Add ocaml-gen.
561883a08955c370309c5149812950d6387d5df5.camel@telenet.be
Toggle quote (18 lines)> -(define-public ocaml4.07-gen> +(define-public ocaml-gen> [...]> `(#:tests? #f; no tests> - #:package "gen"> - #:ocaml ,ocaml-4.07> - #:findlib ,ocaml4.07-findlib> - #:dune ,ocaml4.07-dune))> + #:package "gen"))> (propagated-inputs> - `(("ocaml-odoc" ,(package-with-ocaml4.07 ocaml4.07-odoc))))> + `(("ocaml-odoc" ,ocaml-odoc)))> (native-inputs> - `(("ocaml-qtest" ,(package-with-ocaml4.07 ocaml-qtest))> - ("ocaml-qcheck" ,(package-with-ocaml4.07 ocaml-qcheck))))> + `(("ocaml-qtest" ,ocaml-qtest)> + ("ocaml-qcheck" ,ocaml-qcheck)))
I'm confused what's going on here.ocaml-qtest is for unit tests (https://opam.ocaml.org/packages/qtest/qtest.2.1.0/),but for this package we have ‘#:tests? #f; no tests?’?That seems contradictory.
Greetings,Maxime.
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYHc6YhccbWF4aW1lZGV2b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7r6ZAP4oGMjmh/GyvcH5VOCG6WZUoYQenRtUT9N2u+Mk1l4kqAD9FA3EsA9IUOcOlUtCH6OCYvljjsq2O2AwuPEJk/kyZAo==mB76-----END PGP SIGNATURE-----

P
P
pukkamustard wrote on 20 Apr 07:54 +0200
Re: [bug#47768] [PATCH 04/37] gnu: ocaml-lwt: Make libev a propagated input.
(name . Maxime Devos)(address . maximedevos@telenet.be)(address . 47768@debbugs.gnu.org)
864kg1fpvc.fsf@posteo.net
Hi Maxime,
Thanks for your review!
Maxime Devos <maximedevos@telenet.be> writes:
Toggle quote (12 lines)> On Wed, 2021-04-14 at 11:12 +0200, pukkamustard wrote:>> * gnu/packages/ocaml.scm (ocaml-lwt) [propagated-inputs]: Add >> libev.>> [inputs]: Remove libev.>> (ocaml-ouint2, ocaml4.07-lambda-term, ocaml-markup) [inputs]: >> Remove libev.>> --->> What's the reason libev has been moved from inputs to > propagated-inputs?>
As far as I understand libev is a runtime/build time dependency of lwt.
Before this patch it was necessary for packages using lwt to also addlibev as input (e.g. ocaml4.07-lambda-term or ocaml-markup). This waseven worse when using lwt indirectly (e.g. by including ocaml-markupsomewhere): build would fail but it was not clear what needs to be doneas lwt was not directly included as input (but as propagated-input ofocaml-markup).
Adding libev as propagate-input makes packages using lwt "just work".
-pukkamustard
P
P
pukkamustard wrote on 20 Apr 08:11 +0200
Re: [bug#47768] [PATCH 07/37] gnu: Add ocaml-gen.
(name . Maxime Devos)(address . maximedevos@telenet.be)(address . 47768@debbugs.gnu.org)
8635vlfpgy.fsf@posteo.net
Maxime Devos <maximedevos@telenet.be> writes:
Toggle quote (25 lines)>> -(define-public ocaml4.07-gen>> +(define-public ocaml-gen>> [...]>> `(#:tests? #f; no tests>> - #:package "gen">> - #:ocaml ,ocaml-4.07>> - #:findlib ,ocaml4.07-findlib>> - #:dune ,ocaml4.07-dune))>> + #:package "gen"))>> (propagated-inputs>> - `(("ocaml-odoc" ,(package-with-ocaml4.07 >> ocaml4.07-odoc))))>> + `(("ocaml-odoc" ,ocaml-odoc)))>> (native-inputs>> - `(("ocaml-qtest" ,(package-with-ocaml4.07 ocaml-qtest))>> - ("ocaml-qcheck" ,(package-with-ocaml4.07 >> ocaml-qcheck))))>> + `(("ocaml-qtest" ,ocaml-qtest)>> + ("ocaml-qcheck" ,ocaml-qcheck)))>> I'm confused what's going on here.> ocaml-qtest is for unit tests > (https://opam.ocaml.org/packages/qtest/qtest.2.1.0/),> but for this package we have ‘#:tests? #f; no tests?’?
Excellent catch! There are in fact tests and they also pass. Please findattached updated patch that enables tests (I can also resend the entirepatch series as v2 if that is easier).
The `#tests? #f` was introduced with commit5a4003f453ee8afdfe21d959e105250bfc876063 in 2019 and I blindly copied it.
-pukkamustard
From 3036a81329f65c6c9ffe2117744590a7e52aee01 Mon Sep 17 00:00:00 2001From: pukkamustard <pukkamustard@posteo.net>Date: Fri, 9 Apr 2021 14:59:36 +0200Subject: [PATCH] gnu: Add ocaml-gen.
* gnu/packages/ocaml.scm (ocaml-gen): New variable. (ocaml4.07-gen): Remove variable. (ocaml4.07-sedlex): Replace ocaml4.07-gen with ocaml-gen.--- gnu/packages/ocaml.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
Toggle diff (49 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 503913c8fd..1acde9c0ee 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -2508,9 +2508,9 @@ format. It can process XML documents without a complete in-memory representation of the data.") (license license:isc))) -(define-public ocaml4.07-gen+(define-public ocaml-gen (package- (name "ocaml4.07-gen")+ (name "ocaml-gen") (version "0.5.3") (source (origin (method git-fetch)@@ -2523,16 +2523,13 @@ representation of the data.") "1jzrs0nsdk55annkd2zrk5svi61i3b1nk6qyqdc2y26vnzqvzfg8")))) (build-system dune-build-system) (arguments- `(#:tests? #f; no tests- #:package "gen"- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ `(#:package "gen"+ #:test-target ".")) (propagated-inputs- `(("ocaml-odoc" ,(package-with-ocaml4.07 ocaml4.07-odoc))))+ `(("ocaml-odoc" ,ocaml-odoc))) (native-inputs- `(("ocaml-qtest" ,(package-with-ocaml4.07 ocaml-qtest))- ("ocaml-qcheck" ,(package-with-ocaml4.07 ocaml-qcheck))))+ `(("ocaml-qtest" ,ocaml-qtest)+ ("ocaml-qcheck" ,ocaml-qcheck))) (home-page "https://github.com/c-cube/gen/") (synopsis "Iterators for OCaml, both restartable and consumable") (description "Gen implements iterators of OCaml, that are both restartable@@ -2577,7 +2574,7 @@ and consumable.") (native-inputs `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) (propagated-inputs- `(("ocaml-gen" ,ocaml4.07-gen)+ `(("ocaml-gen" ,(package-with-ocaml4.07 ocaml-gen)) ("ocaml-ppx-tools-versioned" ,(package-with-ocaml4.07 ocaml-ppx-tools-versioned)) ("ocaml-uchar" ,(package-with-ocaml4.07 ocaml-uchar))))-- 2.31.1
M
M
Maxime Devos wrote on 21 Apr 13:29 +0200
(name . pukkamustard)(address . pukkamustard@posteo.net)(address . 47768@debbugs.gnu.org)
d972a78059ab9ff76e4fd2c6824b081c696ed664.camel@telenet.be
pukkamustard schreef op di 20-04-2021 om 06:11 [+0000]:
Toggle quote (6 lines)> [...]> Please find> attached updated patch that enables tests (I can also resend the > entire> patch series as v2 if that is easier).
I can confirm all packages you modified still build. But I don't reallyknow anything about ocaml.
Greetings,Maxime.
-----BEGIN PGP SIGNATURE-----
iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYIAMsxccbWF4aW1lZGV2b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7vLeAQDVIRSFJn5T7ga9OpHBQLI343BtbEjqDb2UmncTyKTIAwD/V0EbttFk3W2TvKM1h91d6zTzJO6UAyJnMllzzwCxyAo==7BNe-----END PGP SIGNATURE-----

P
P
pukkamustard wrote on 10 May 07:15 +0200
[PATCH v2 00/43] Assorted OCaml patches (V2)
(address . 47768@debbugs.gnu.org)
20210510051628.15359-1-pukkamustard@posteo.net
Hello Guix,
This is V2 of the patch series which includes the fixes suggested by Maxime for ocaml-gen and merges issue #45558 (Add js_of_ocaml by divoplade; https://issues.guix.gnu.org/45558).
This is becoming an even larger series. Please let me know if there is anything I can do to make this easier to review.
Thanks!pukkamustard
divoplade (2): gnu: Add ocaml-graphics. gnu: Add ocaml-js-of-ocaml.
pukkamustard (41): gnu: ocaml-integers: Update to 0.4.0. gnu: ocaml-ctypes: Update to 0.18.0. gnu: ocaml-ctypes: Make ocaml-integers a propagated input. gnu: ocaml-lwt: Make libev a propagated input. gnu: ocaml-lwt: Update to 5.4.0. gnu: ocaml4.07-gen: Update to 0.5.3. gnu: Add ocaml-gen. gnu: Add ocaml-stdio. gnu: Add ocaml-compiler-libs. gnu: ocaml-migrate-parsetree: Update to 1.8.0. gnu: ocaml-migrate-parsetree: Update to 2.1.0. gnu: Add ocaml-ppxlib. gnu: Add ocaml-sedlex. gnu: Add ocaml-uunf. gnu: Add ocaml-ppx-sexp-conv. gnu: Add ocaml-bigstringaf. gnu: Add ocaml-ppx-let. gnu: Add ocaml-syntax-shims. gnu: Add ocaml-ppx-compare. gnu: Add ocaml-ppx-here. gnu: Add ocaml-ppx-cold. gnu: Add ocaml-ppx-assert. gnu: Add ocaml-ppx-custom-printf. gnu: Add ocaml-ppx-hash. gnu: Add ocaml-ppx-enumerate. gnu: Add ocaml-ppx-js-style. gnu: Add ocaml-ppx-base. gnu: Add ocaml-fieldslib. gnu: Add ocaml-ppx-fields-conv. gnu: Add ocaml-ppx-optcomp gnu: Add ocaml-ppx-optional. gnu: Add ocaml-jst-config. gnu: Add ocaml-jane-street-headers. gnu: Add ocaml-time-now. gnu: Add ocaml-ppx-inline-test. gnu: Add ocaml-angstrom. gnu: Add ocaml-uri. gnu: Add ocaml-variantslib. gnu: Add ocaml-ppx-variants-conv. gnu: Add ocaml-ppx-expect. gnu: ocaml-num: Update to 1.4.
gnu/packages/ocaml.scm | 1738 ++++++++++++++++++++++++++-------------- 1 file changed, 1120 insertions(+), 618 deletions(-)
-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:15 +0200
[PATCH v2 02/43] gnu: ocaml-ctypes: Update to 0.18.0.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-3-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ctypes): Update to 0.18.0.--- gnu/packages/ocaml.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
Toggle diff (33 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 8069ad31d8..46b5542864 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -3833,7 +3833,7 @@ long and size_t whose sizes depend on the host platform.") (define-public ocaml-ctypes (package (name "ocaml-ctypes")- (version "0.14.0")+ (version "0.18.0") (home-page "https://github.com/ocamllabs/ocaml-ctypes") (source (origin (method git-fetch)@@ -3843,7 +3843,7 @@ long and size_t whose sizes depend on the host platform.") (file-name (git-file-name name version)) (sha256 (base32- "1b2q3h63ngf4x9qp65qwapf2dg9q0mcdah6qjm2q0c7v2p5vysv9"))))+ "03zrbnl16m67ls0yfhq7a4k4238x6x6b3m456g4dw2yqwc153vks")))) (build-system ocaml-build-system) (arguments `(#:tests? #f; require an old lwt@@ -3862,6 +3862,8 @@ long and size_t whose sizes depend on the host platform.") (delete 'configure)))) (native-inputs `(("pkg-config" ,pkg-config)))+ (propagated-inputs+ `(("bigarray-compat" ,ocaml-bigarray-compat))) (inputs `(("libffi" ,libffi) ("ounit" ,ocaml-ounit)-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:15 +0200
[PATCH v2 01/43] gnu: ocaml-integers: Update to 0.4.0.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-2-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-integers): Update to 0.4.0.--- gnu/packages/ocaml.scm | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-)
Toggle diff (54 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 427ea38ccc..8069ad31d8 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -17,7 +17,7 @@ ;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com> ;;; Copyright © 2020 divoplade <d@divoplade.fr>-;;; Copyright © 2020 pukkamustard <pukkamustard@posteo.net>+;;; Copyright © 2020, 2021 pukkamustard <pukkamustard@posteo.net> ;;; Copyright © 2021 aecepoglu <aecepoglu@fastmail.fm> ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com> ;;;@@ -3810,29 +3810,20 @@ sensitive completion, colors, and more.") (define-public ocaml-integers (package (name "ocaml-integers")- (version "0.3.0")+ (version "0.4.0") (home-page "https://github.com/ocamllabs/ocaml-integers") (source (origin- (method url-fetch)- (uri (string-append home-page- "/releases/download/v0.2.2/integers-"- version ".tbz"))- (file-name (string-append name "-" version ".tbz"))+ (method git-fetch)+ (uri (git-reference+ (url home-page)+ (commit version)))+ (file-name (git-file-name name version)) (sha256 (base32- "08b1ljw88ny3l0mdq6xmffjk8anfc77igryva5jz1p6f4f746ywk"))))- (build-system ocaml-build-system)+ "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd"))))+ (build-system dune-build-system) (arguments- `(#:tests? #f; no tests- #:build-flags (list "build")- #:phases- (modify-phases %standard-phases- (delete 'configure))))- (native-inputs- `(("ocamlbuild" ,ocamlbuild)))- (inputs- `(("topkg" ,ocaml-topkg)- ("opam" ,opam)))+ `(#:tests? #f)) ; no tests (synopsis "Various signed and unsigned integer types for OCaml") (description "The ocaml-integers library provides a number of 8-, 16-, 32- and 64-bit signed and unsigned integer types, together with aliases such as-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:15 +0200
[PATCH v2 03/43] gnu: ocaml-ctypes: Make ocaml-integers a propagated input.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-4-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ctypes)[propagated-inputs]: Add ocaml-integers. [inputs]: Remove ocaml-integers.--- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (20 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 46b5542864..7d467b3b70 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -3863,11 +3863,11 @@ long and size_t whose sizes depend on the host platform.") (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs- `(("bigarray-compat" ,ocaml-bigarray-compat)))+ `(("bigarray-compat" ,ocaml-bigarray-compat)+ ("integers" ,ocaml-integers))) (inputs `(("libffi" ,libffi) ("ounit" ,ocaml-ounit)- ("integers" ,ocaml-integers) ("lwt" ,ocaml-lwt) ("topkg" ,ocaml-topkg) ("opam" ,opam)))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:15 +0200
[PATCH v2 04/43] gnu: ocaml-lwt: Make libev a propagated input.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-5-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-lwt) [propagated-inputs]: Add libev. [inputs]: Remove libev. (ocaml-ouint2, ocaml4.07-lambda-term, ocaml-markup) [inputs]: Remove libev.--- gnu/packages/ocaml.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
Toggle diff (51 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 7d467b3b70..5509ff495c 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -1342,9 +1342,6 @@ compilers that can directly deal with packages.") (base32 "0gxjw1bhmjcjzri6x6psqrkbbyq678b69bqfl9i1zswp7cj2lryg")))) (build-system dune-build-system)- (inputs- ;; XXX Should libev be a propagated-input of ocaml-lwt?- `(("libev" ,libev))) (propagated-inputs `(("lwt" ,ocaml-lwt) ("ocaml-stdlib-shims" ,ocaml-stdlib-shims)))@@ -2318,13 +2315,13 @@ for mapping files in memory. This function is the same as the ("ocaml-cppo" ,ocaml-cppo) ("pkg-config" ,pkg-config))) (inputs- `(("libev" ,libev)- ("glib" ,glib)))+ `(("glib" ,glib))) (propagated-inputs `(("ocaml-mmap" ,ocaml-mmap) ("ocaml-ocplib-endian" ,ocaml-ocplib-endian) ("ocaml-result" ,ocaml-result)- ("ocaml-seq" ,ocaml-seq)))+ ("ocaml-seq" ,ocaml-seq)+ ("libev" ,libev))) (home-page "https://github.com/ocsigen/lwt") (synopsis "Cooperative threads and I/O in monadic style") (description "Lwt provides typed, composable cooperative threads. These@@ -3761,8 +3758,6 @@ connect an engine to your inputs and rendering functions to get an editor.") ("ocaml-lwt-log" ,(package-with-ocaml4.07 ocaml-lwt-log)) ("ocaml-lwt-react" ,(package-with-ocaml4.07 ocaml-lwt-react)) ("ocaml-zed" ,ocaml4.07-zed)))- (inputs- `(("libev" ,libev))) (home-page "https://github.com/diml/lambda-term") (synopsis "Terminal manipulation library for OCaml") (description "Lambda-Term is a cross-platform library for manipulating the@@ -6011,8 +6006,6 @@ the full Core is not available, such as in Javascript.") (build-system dune-build-system) (arguments `(#:package "markup"))- (inputs- `(("libev" ,libev))) (propagated-inputs `(("ocaml-bisect-ppx" ,ocaml-bisect-ppx) ("ocaml-uchar" ,ocaml-uchar)-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:15 +0200
[PATCH v2 06/43] gnu: ocaml4.07-gen: Update to 0.5.3.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-7-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml4.07-gen): Update to 4.07.--- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (24 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 85f73b6d69..34e1b954d2 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -2511,7 +2511,7 @@ representation of the data.") (define-public ocaml4.07-gen (package (name "ocaml4.07-gen")- (version "0.5.2")+ (version "0.5.3") (source (origin (method git-fetch) (uri (git-reference@@ -2520,7 +2520,7 @@ representation of the data.") (file-name (git-file-name name version)) (sha256 (base32- "1h9g508rnj2j8va5nvhamzscp954vrkh0hdf4pn3d10pcfyslfg2"))))+ "1jzrs0nsdk55annkd2zrk5svi61i3b1nk6qyqdc2y26vnzqvzfg8")))) (build-system dune-build-system) (arguments `(#:tests? #f; no tests-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:15 +0200
[PATCH v2 08/43] gnu: Add ocaml-stdio.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-9-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-stdio): New variable. (ocaml4.07-stdio): Inherit from ocaml-stdio.--- gnu/packages/ocaml.scm | 58 +++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-)
Toggle diff (153 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 877b9284d1..95407de74d 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -1978,7 +1978,7 @@ library.") #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-stdio" ,ocaml4.07-stdio)+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("pkg-config" ,pkg-config))) (inputs `(("sqlite" ,sqlite)))@@ -4086,7 +4086,7 @@ syntax checking on dedukti files.") ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-compiler-libs" ,ocaml4.07-compiler-libs) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0))- ("ocaml-stdio" ,ocaml4.07-stdio)+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (properties `((upstream-name . "ppx_inline_test"))) (synopsis "Syntax extension for writing in-line tests in ocaml code")@@ -4429,7 +4429,7 @@ Atom.") `(("gsl" ,gsl))) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-stdio" ,ocaml4.07-stdio)))+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://mmottl.github.io/gsl-ocaml") (synopsis "Bindings to the GNU Scientific Library") (description@@ -4714,30 +4714,20 @@ 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-stdio+(define-public ocaml-stdio (package- (name "ocaml4.07-stdio")- (version "0.11.0")+ (name "ocaml-stdio")+ (version "0.14.0") (home-page "https://github.com/janestreet/stdio") (source- (origin- (method git-fetch)- (uri (git-reference- (url (string-append home-page ".git"))- (commit (string-append "v" version))))- (file-name (git-file-name name version))- (sha256- (base32- "1facajqhvq34g2wrg368y0ajxd6lrj5b3lyzyj0jhdmraxajjcwn"))))+ (janestreet-origin "stdio" version+ "1hj5hraprqy2i90a690l11yjszvb99j818q3d684ryx6p2lddk0l")) (build-system dune-build-system) (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0))))- (arguments- `(#:tests? #f ;no tests- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-sexplib0" ,ocaml-sexplib0)))+ (arguments `(#:tests? #f)) ;no tests+ (properties `((ocaml4.07-variant . ,(delay ocaml4.07-stdio)))) (synopsis "Standard IO library for OCaml") (description "Stdio implements simple input/output functionalities for OCaml. It@@ -4745,6 +4735,16 @@ re-exports the input/output functions of the OCaml standard libraries using a more consistent API.") (license license:expat))) +(define-public ocaml4.07-stdio+ (package-with-ocaml4.07+ (package+ (inherit ocaml-stdio)+ (version "0.11.0")+ (source+ (janestreet-origin "stdio" version+ "0pqbp2wy5fgmc38irwvmj9nlcvclb1ix1mp4y7l39bgvvlz303h9"))+ (properties '()))))+ (define-public ocaml-ppx-derivers (package (name "ocaml-ppx-derivers")@@ -4794,7 +4794,7 @@ as part of the same ocaml-migrate-parsetree driver.") ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppx-derivers" ,(package-with-ocaml4.07 ocaml-ppx-derivers))- ("ocaml-stdio" ,ocaml4.07-stdio)+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)))) (arguments@@ -5422,7 +5422,7 @@ else expression.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-stdio" ,ocaml4.07-stdio)+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib))) (properties `((upstream-name . "ppx_optcomp"))) (home-page "https://github.com/janestreet/ppx_optcomp")@@ -5551,7 +5551,7 @@ useful errors on failure.") ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv)- ("ocaml-stdio" ,ocaml4.07-stdio)+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib)@@ -5827,7 +5827,7 @@ various Jane Street packages.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-stdio" ,ocaml4.07-stdio)))+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://github.com/janestreet/configurator") (synopsis "Helper library for gathering system configuration") (description "Configurator is a small library that helps writing OCaml@@ -5920,7 +5920,7 @@ thousands of times faster than fork. ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-spawn" ,ocaml4.07-spawn)- ("ocaml-stdio" ,ocaml4.07-stdio)+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))@@ -5967,7 +5967,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-splittable-random" ,ocaml4.07-splittable-random)- ("ocaml-stdio" ,ocaml4.07-stdio)+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-typerep" ,ocaml4.07-typerep) ("ocaml-variantslib" ,ocaml4.07-variantslib) ("ocaml-migrate-parsetree"@@ -6251,7 +6251,7 @@ library FFTW.") `(("openblas" ,openblas) ("lapack" ,lapack) ("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-stdio" ,ocaml4.07-stdio)))+ ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)))) (home-page "https://mmottl.github.io/lacaml/") (synopsis "OCaml-bindings to BLAS and LAPACK")-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:15 +0200
[PATCH v2 10/43] gnu: ocaml-migrate-parsetree: Update to 1.8.0.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-11-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 1.8.0.--- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (24 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 93cfa8f54b..faa024b261 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -1771,7 +1771,7 @@ module of this library is parameterised by the type of S-expressions.") (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree")- (version "1.7.3")+ (version "1.8.0") (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") (source (origin@@ -1782,7 +1782,7 @@ module of this library is parameterised by the type of S-expressions.") (file-name (git-file-name name version)) (sha256 (base32- "0336vz0galjnsazbmkxjwdv1qvdqsx2rgrvp778xgq2fzasz45cx"))))+ "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq")))) (build-system dune-build-system) (arguments `(#:tests? #f))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:15 +0200
[PATCH v2 05/43] gnu: ocaml-lwt: Update to 5.4.0.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-6-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-lwt): Update to 5.4.0.--- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (24 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 5509ff495c..85f73b6d69 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -2297,7 +2297,7 @@ for mapping files in memory. This function is the same as the (define-public ocaml-lwt (package (name "ocaml-lwt")- (version "5.1.1")+ (version "5.4.0") (source (origin (method git-fetch)@@ -2306,7 +2306,7 @@ for mapping files in memory. This function is the same as the (commit version))) (file-name (git-file-name name version)) (sha256 (base32- "1nl7rdnwfdhwcsm5zpay1nr9y5cbapd9x1qzily7zk9ab4v52m8g"))))+ "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d")))) (build-system dune-build-system) (arguments `(#:package "lwt"))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:15 +0200
[PATCH v2 11/43] gnu: ocaml-migrate-parsetree: Update to 2.1.0.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-12-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-migrate-parsetree): Update to 2.1.0. (ocaml-migrate-parsetree-1): New variable.--- gnu/packages/ocaml.scm | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-)
Toggle diff (92 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex faa024b261..0b606e296c 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -1771,32 +1771,51 @@ module of this library is parameterised by the type of S-expressions.") (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree")- (version "1.8.0")+ (version "2.1.0") (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree") (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- "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq"))))+ "1cpgdqcs624nd1p271ddakgyibl0ia4f6dzivnz9qdwszsinwr89")))) (build-system dune-build-system)- (arguments- `(#:tests? #f))+ (arguments `(#:tests? #f)) (propagated-inputs `(("ocaml-ppx-derivers" ,ocaml-ppx-derivers) ("ocamlbuild" ,ocamlbuild) ("ocaml-result" ,ocaml-result)))- (properties `((upstream-name . "ocaml-migrate-parsetree")))+ (properties `((upstream-name . "ocaml-migrate-parsetree")+ ;; OCaml 4.07 packages require version 1.*+ (ocaml4.07-variant . ,(delay (package-with-ocaml4.07 ocaml-migrate-parsetree-1))))) (synopsis "OCaml parsetree converter") (description "This library converts between parsetrees of different OCaml versions. For each version, there is a snapshot of the parsetree and conversion functions to the next and/or previous version.") (license license:lgpl2.1+)))- ++(define-public ocaml-migrate-parsetree-1+ (package+ (inherit ocaml-migrate-parsetree)+ (name "ocaml-migrate-parsetree-1")+ (version "1.8.0")+ (home-page "https://github.com/ocaml-ppx/ocaml-migrate-parsetree")+ (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+ "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq"))))+ (properties '((upstream-name . "ocaml-migrate-parsetree")))))+ (define-public ocaml-ppx-tools-versioned (package (name "ocaml-ppx-tools-versioned")@@ -1815,7 +1834,7 @@ functions to the next and/or previous version.") `(#:test-target "." #:package "ppx_tools_versioned")) (propagated-inputs- `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)))+ `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1))) (properties `((upstream-name . "ppx_tools_versioned"))) (home-page "https://github.com/let-def/ppx_tools_versioned") (synopsis "Variant of ppx_tools")@@ -6121,7 +6140,7 @@ combinators.") "0900vli5kw7s5kdam0n4cqsfsfqb7mdb3azn3i55595gilg1vyn8")))) (build-system dune-build-system) (propagated-inputs- `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1) ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) ("ocaml-ounit" ,ocaml-ounit))) (arguments@@ -6360,7 +6379,7 @@ variants.") ("ocaml-cmdliner" ,ocaml-cmdliner) ("ocaml-re" ,ocaml-re) ("ocaml-result" ,ocaml-result)- ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree-1) ("ocaml-odoc" ,ocaml-odoc) ("ocaml-version" ,ocaml-version))) (native-inputs-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:15 +0200
[PATCH v2 07/43] gnu: Add ocaml-gen.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-8-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-gen): New variable. (ocaml4.07-gen): Remove variable. (ocaml4.07-sedlex): Replace ocaml4.07-gen with ocaml-gen.--- gnu/packages/ocaml.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-)
Toggle diff (49 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 34e1b954d2..877b9284d1 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -2508,9 +2508,9 @@ format. It can process XML documents without a complete in-memory representation of the data.") (license license:isc))) -(define-public ocaml4.07-gen+(define-public ocaml-gen (package- (name "ocaml4.07-gen")+ (name "ocaml-gen") (version "0.5.3") (source (origin (method git-fetch)@@ -2523,16 +2523,13 @@ representation of the data.") "1jzrs0nsdk55annkd2zrk5svi61i3b1nk6qyqdc2y26vnzqvzfg8")))) (build-system dune-build-system) (arguments- `(#:tests? #f; no tests- #:package "gen"- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ `(#:package "gen"+ #:test-target ".")) (propagated-inputs- `(("ocaml-odoc" ,(package-with-ocaml4.07 ocaml4.07-odoc))))+ `(("ocaml-odoc" ,ocaml-odoc))) (native-inputs- `(("ocaml-qtest" ,(package-with-ocaml4.07 ocaml-qtest))- ("ocaml-qcheck" ,(package-with-ocaml4.07 ocaml-qcheck))))+ `(("ocaml-qtest" ,ocaml-qtest)+ ("ocaml-qcheck" ,ocaml-qcheck))) (home-page "https://github.com/c-cube/gen/") (synopsis "Iterators for OCaml, both restartable and consumable") (description "Gen implements iterators of OCaml, that are both restartable@@ -2577,7 +2574,7 @@ and consumable.") (native-inputs `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)))) (propagated-inputs- `(("ocaml-gen" ,ocaml4.07-gen)+ `(("ocaml-gen" ,(package-with-ocaml4.07 ocaml-gen)) ("ocaml-ppx-tools-versioned" ,(package-with-ocaml4.07 ocaml-ppx-tools-versioned)) ("ocaml-uchar" ,(package-with-ocaml4.07 ocaml-uchar))))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:15 +0200
[PATCH v2 09/43] gnu: Add ocaml-compiler-libs.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-10-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-compiler-libs): New variable. (ocaml4.07-compiler-libs): Inherit from ocaml-compiler-libs.--- gnu/packages/ocaml.scm | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-)
Toggle diff (86 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 95407de74d..93cfa8f54b 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4084,7 +4084,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)))@@ -4686,34 +4686,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")@@ -4790,7 +4806,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))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:15 +0200
[PATCH v2 14/43] gnu: Add ocaml-uunf.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-15-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-uunf): New variable.--- gnu/packages/ocaml.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
Toggle diff (45 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 605567b996..a320f94097 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -2708,6 +2708,38 @@ Functions are also provided to fold over the characters of UTF encoded OCaml string values and to directly encode characters in OCaml Buffer.t values.") (license license:isc))) +(define-public ocaml-uunf+ (package+ (name "ocaml-uunf")+ (version "13.0.0")+ (source+ (origin+ (method url-fetch)+ (uri "https://erratique.ch/software/uunf/releases/uunf-13.0.0.tbz")+ (sha256+ (base32+ "1qci04nkp24kdls1z4s8kz5dzgky4nwd5r8345nwdrgwmxhw7ksm"))))+ (build-system ocaml-build-system)+ (arguments+ `(#:tests? #f+ #:build-flags (list "build")+ #:phases+ (modify-phases %standard-phases+ (delete 'configure))))+ (native-inputs+ `(("ocamlbuild" ,ocamlbuild)+ ("opam" ,opam)+ ("topkg" ,ocaml-topkg)))+ (propagated-inputs `(("ocaml-uutf" ,ocaml-uutf)))+ (home-page "https://erratique.ch/software/uunf")+ (synopsis "Unicode text normalization for OCaml")+ (description+ "Uunf is an OCaml library for normalizing Unicode text. It supports all+Unicode normalization forms. The library is independent from any+IO mechanism or Unicode text data structure and it can process text+without a complete in-memory representation.")+ (license license:isc)))+ (define-public ocaml-jsonm (package (name "ocaml-jsonm")-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:15 +0200
[PATCH v2 13/43] gnu: Add ocaml-sedlex.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-14-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-sedlex): New variable. (ocaml4.07-sedlex): Inherit from ocaml-sedlex.--- gnu/packages/ocaml.scm | 57 ++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 19 deletions(-)
Toggle diff (112 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 7fe59c0b95..605567b996 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -2555,10 +2555,10 @@ representation of the data.") and consumable.") (license license:bsd-2))) -(define-public ocaml4.07-sedlex+(define-public ocaml-sedlex (package- (name "ocaml4.07-sedlex")- (version "2.1")+ (name "ocaml-sedlex")+ (version "2.3") (source (origin (method git-fetch) (uri (git-reference@@ -2567,36 +2567,37 @@ and consumable.") (file-name (git-file-name name version)) (sha256 (base32- "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26"))))+ "0iw3phlaqr27jdf857hmj5v5hdl0vngbb2h37p2ll18sw991fxar")))) (build-system dune-build-system) (arguments- `(#:tests? #f; no tests+ `(#:tests? #f ; no tests #:package "sedlex" #:phases (modify-phases %standard-phases (add-before 'build 'copy-resources (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "src/generator/data"+ ;; Newer versions of dune emit an error if files it wants to+ ;; build already exist. Delete the dune file so dune doesn't+ ;; complain.+ (delete-file "dune") (for-each- (lambda (file)- (copy-file (assoc-ref inputs file) file))- '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt"- "PropList.txt")))+ (lambda (file)+ (copy-file (assoc-ref inputs file) file))+ '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt"+ "PropList.txt"))) #t)) (add-before 'build 'chmod (lambda _ (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*"))- #t)))- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ #t))))) (native-inputs- `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild))))+ `(("ocamlbuild" ,ocamlbuild))) (propagated-inputs- `(("ocaml-gen" ,(package-with-ocaml4.07 ocaml-gen))- ("ocaml-ppx-tools-versioned"- ,(package-with-ocaml4.07 ocaml-ppx-tools-versioned))- ("ocaml-uchar" ,(package-with-ocaml4.07 ocaml-uchar))))+ `(("ocaml-gen" ,ocaml-gen)+ ("ocaml-ppxlib" ,ocaml-ppxlib)+ ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned)+ ("ocaml-uchar" ,ocaml-uchar))) ;; These three files are needed by src/generator/data/dune, but would be ;; downloaded using curl at build time. (inputs@@ -2621,11 +2622,29 @@ and consumable.") (sha256 (base32 "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk"))))))+ (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sedlex)))) (home-page "https://www.cduce.org/download.html#side") (synopsis "Lexer generator for Unicode and OCaml") (description "Lexer generator for Unicode and OCaml.") (license license:expat))) +(define-public ocaml4.07-sedlex+ (package-with-ocaml4.07+ (package+ (inherit ocaml-sedlex)+ (name "ocaml-sedlex")+ (version "2.1")+ (source (origin+ (method git-fetch)+ (uri (git-reference+ (url "https://github.com/ocaml-community/sedlex")+ (commit (string-append "v" version))))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26"))))+ (properties '()))))+ (define-public ocaml-uchar (package (name "ocaml-uchar")@@ -3473,7 +3492,7 @@ Format module of the OCaml standard library.") `(("which" ,which))) (propagated-inputs `(("ocaml-xmlm" ,(package-with-ocaml4.07 ocaml-xmlm))- ("ocaml-sedlex" ,ocaml4.07-sedlex)+ ("ocaml-sedlex" ,(package-with-ocaml4.07 ocaml-sedlex)) ("ocaml-easy-format" ,(package-with-ocaml4.07 ocaml-easy-format)) ("ocaml-base64" ,(package-with-ocaml4.07 ocaml-base64)))) (home-page "http://piqi.org")-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:15 +0200
[PATCH v2 12/43] gnu: Add ocaml-ppxlib.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-13-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppxlib): New variable. (ocaml4.07-ppxlib): Inherit from ocaml-ppxlib.--- gnu/packages/ocaml.scm | 144 +++++++++++++++++++++++------------------ 1 file changed, 81 insertions(+), 63 deletions(-)
Toggle diff (365 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 0b606e296c..7fe59c0b95 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4106,7 +4106,7 @@ syntax checking on dedukti files.") ("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)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_inline_test"))) (synopsis "Syntax extension for writing in-line tests in ocaml code") (description "This package contains a syntax extension for writing@@ -4807,54 +4807,32 @@ ppx_deriving and ppx_type_conv to inter-operate gracefully when linked as part of the same ocaml-migrate-parsetree driver.") (license license:bsd-3))) -(define-public ocaml4.07-ppxlib+(define-public ocaml-ppxlib (package- (name "ocaml4.07-ppxlib")- (version "0.6.0")+ (name "ocaml-ppxlib")+ (version "0.22.0") (home-page "https://github.com/ocaml-ppx/ppxlib") (source (origin (method git-fetch) (uri (git-reference- (url (string-append home-page ".git"))+ (url home-page) (commit version))) (file-name (git-file-name name version)) (sha256 (base32- "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv"))))+ "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q")))) (build-system dune-build-system) (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("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))- ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio))- ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result))- ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0))))- (arguments- `(#:phases- (modify-phases %standard-phases- (add-before 'check 'set-topfind- (lambda* (#:key inputs #:allow-other-keys)- ;; add the line #directory ".." at the top of each file- ;; using #use "topfind";; to be able to find topfind- (let* ((findlib-path (assoc-ref inputs "findlib"))- (findlib-libdir- (string-append findlib-path "/lib/ocaml/site-lib")))- (substitute* '("test/base/test.ml"- "test/code_path/test.ml"- "test/deriving/test.ml"- "test/driver/attributes/test.ml"- "test/driver/non-compressible-suffix/test.ml"- "test/driver/transformations/test.ml")- (("#use \"topfind\";;" all)- (string-append "#directory \"" findlib-libdir "\"\n"- all))))- #t)))- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-compiler-libs" ,ocaml-compiler-libs)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-stdlib-shims" ,ocaml-stdlib-shims)+ ("ocaml-ppx-derivers" ,ocaml-ppx-derivers)+ ("ocaml-stdio" ,ocaml-stdio)+ ("ocaml-result" ,ocaml-result)+ ("ocaml-sexplib0" ,ocaml-sexplib0)))+ (properties `((ocaml4.07-variant . ,(delay ocaml4.07-ppxlib)))) (synopsis "Base library and tools for ppx rewriters") (description@@ -4872,6 +4850,46 @@ OCaml AST in the OCaml syntax; @end itemize") (license license:expat))) +(define-public ocaml4.07-ppxlib+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppxlib)+ (name "ocaml-ppxlib")+ (version "0.6.0")+ (home-page "https://github.com/ocaml-ppx/ppxlib")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url home-page)+ (commit version)))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv"))))+ (build-system dune-build-system)+ (arguments+ `(#:phases+ (modify-phases %standard-phases+ (add-before 'check 'set-topfind+ (lambda* (#:key inputs #:allow-other-keys)+ ;; add the line #directory ".." at the top of each file+ ;; using #use "topfind";; to be able to find topfind+ (let* ((findlib-path (assoc-ref inputs "findlib"))+ (findlib-libdir+ (string-append findlib-path "/lib/ocaml/site-lib")))+ (substitute* '("test/base/test.ml"+ "test/code_path/test.ml"+ "test/deriving/test.ml"+ "test/driver/attributes/test.ml"+ "test/driver/non-compressible-suffix/test.ml"+ "test/driver/transformations/test.ml")+ (("#use \"topfind\";;" all)+ (string-append "#directory \"" findlib-libdir "\"\n"+ all))))+ #t)))))+ (properties '()))))+ (define-public ocaml4.07-ppx-compare (package (name "ocaml4.07-ppx-compare")@@ -4890,7 +4908,7 @@ OCaml AST in the OCaml syntax; `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib@@ -4929,7 +4947,7 @@ by making sure that you only compare comparable values.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "fieldslib"))) (home-page "https://github.com/janestreet/fieldslib") (synopsis "Syntax extension to record fields")@@ -4961,7 +4979,7 @@ of a record and create new record values.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "variantslib"))) (home-page "https://github.com/janestreet/variantslib") (synopsis "OCaml variants as first class values")@@ -4987,7 +5005,7 @@ standard library.") ("ocaml-fieldslib" ,ocaml4.07-fieldslib) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib@@ -5019,7 +5037,7 @@ new record values.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib@@ -5050,7 +5068,7 @@ definitions.") ("ocaml-variantslib" ,ocaml4.07-variantslib) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib@@ -5083,7 +5101,7 @@ variant types.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib@@ -5183,7 +5201,7 @@ storage of large amounts of data.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (arguments `(#:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib@@ -5218,7 +5236,7 @@ hash functions from type exrpessions and definitions.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_enumerate"))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type")@@ -5250,7 +5268,7 @@ many values).") `(("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_bench"))) (home-page "https://github.com/janestreet/ppx_bench") (synopsis "Syntax extension for writing in-line benchmarks in ocaml code")@@ -5280,7 +5298,7 @@ many values).") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_here"))) (home-page "https://github.com/janestreet/ppx_here") (synopsis "Expands [%here] into its location")@@ -5335,7 +5353,7 @@ many values).") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_sexp_value"))) (home-page "https://github.com/janestreet/ppx_sexp_value") (synopsis "Simplify building s-expressions from ocaml values")@@ -5366,7 +5384,7 @@ ocaml values.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_sexp_message"))) (home-page "https://github.com/janestreet/ppx_sexp_message") (synopsis "A ppx rewriter for easy construction of s-expressions")@@ -5398,7 +5416,7 @@ context such as function arguments.") (propagated-inputs `(("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_pipebang"))) (home-page "https://github.com/janestreet/ppx_pipebang") (synopsis "Inline reverse application operators `|>` and `|!`")@@ -5429,7 +5447,7 @@ context such as function arguments.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_optional"))) (home-page "https://github.com/janestreet/ppx_optional") (synopsis "Pattern matching on flat options")@@ -5458,7 +5476,7 @@ else expression.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_optcomp"))) (home-page "https://github.com/janestreet/ppx_optcomp") (synopsis "Optional compilation for OCaml")@@ -5488,7 +5506,7 @@ size, the version of the compiler, ...") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_let"))) (home-page "https://github.com/janestreet/ppx_let") (synopsis "Monadic let-bindings")@@ -5518,7 +5536,7 @@ match expressions, and if expressions.") ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_fail"))) (home-page "https://github.com/janestreet/ppx_fail") (synopsis "Add location to calls to failwiths")@@ -5550,7 +5568,7 @@ position.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_assert"))) (home-page "https://github.com/janestreet/ppx_assert") (synopsis "Assert-like extension nodes that raise useful errors on failure")@@ -5589,7 +5607,7 @@ useful errors on failure.") ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)+ ("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")@@ -5625,7 +5643,7 @@ to denote the expected output.") ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-octavius" ,(package-with-ocaml4.07 ocaml-octavius))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_js_style"))) (home-page "https://github.com/janestreet/ppx_js_style") (synopsis "Code style checker for Jane Street Packages")@@ -5658,7 +5676,7 @@ packages.") ("ocaml-typerep" ,ocaml4.07-typerep) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_typerep_conv"))) (home-page "https://github.com/janestreet/ppx_typerep_conv") (synopsis "Generation of runtime types from type declarations")@@ -5692,7 +5710,7 @@ from type definitions.") ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_base"))) (home-page "https://github.com/janestreet/ppx_base") (synopsis "Base set of ppx rewriters")@@ -5728,7 +5746,7 @@ verification tool.") ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_bin_prot"))) (home-page "https://github.com/janestreet/ppx_bin_prot") (synopsis "Generation of bin_prot readers and writers from types")@@ -5775,7 +5793,7 @@ functions from type definitions.") ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (properties `((upstream-name . "ppx_jane"))) (home-page "https://github.com/janestreet/ppx_jane") (synopsis "Standard Jane Street ppx rewriters")@@ -5958,7 +5976,7 @@ thousands of times faster than fork. ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,ocaml4.07-ppxlib)))+ ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) (home-page "https://github.com/janestreet/core") (synopsis "Alternative to OCaml's standard library") (description "The Core suite of libraries is an alternative to OCaml's-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 15/43] gnu: Add ocaml-ppx-sexp-conv.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-16-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-sexp-conv): New variable. (ocaml4.07-ppx-sexp-conv): Inherit from ocaml-ppx-sexp-conv.--- gnu/packages/ocaml.scm | 98 ++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 42 deletions(-)
Toggle diff (210 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex a320f94097..823cb00afd 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -3430,7 +3430,7 @@ JSON.") #:dune ,ocaml4.07-dune)) (native-inputs `(("ocaml-ounit" ,(package-with-ocaml4.07 ocaml-ounit))- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)))+ ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)))) (propagated-inputs `(("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0))@@ -5070,36 +5070,50 @@ and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-sexp-conv+(define-public ocaml-ppx-sexp-conv (package- (name "ocaml4.07-ppx-sexp-conv")- (version "0.11.2")- (source (origin- (method git-fetch)- (uri (git-reference- (url "https://github.com/janestreet/ppx_sexp_conv")- (commit (string-append "v" version))))- (file-name (git-file-name name version))- (sha256- (base32- "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9"))))+ (name "ocaml-ppx-sexp-conv")+ (version "0.14.3")+ (home-page "https://github.com/janestreet/ppx_sexp_conv")+ (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+ "0dbri9d00ydi0dw1cavswnqdmhjaaz80vap29ns2lr6mhhlvyjmj")))) (build-system dune-build-system) (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))))- (arguments- `(#:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))- (properties `((upstream-name . "ppx_sexp_conv")))- (home-page "https://github.com/janestreet/ppx_sexp_conv")+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_sexp_conv")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-conv)))) (synopsis "Generation of S-expression conversion functions from type definitions") (description "This package generates S-expression conversion functions from type definitions.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-sexp-conv+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-sexp-conv)+ (name "ocaml-ppx-sexp-conv")+ (version "0.11.2")+ (source (origin+ (method git-fetch)+ (uri (git-reference+ (url "https://github.com/janestreet/ppx_sexp_conv")+ (commit (string-append "v" version))))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9"))))+ (properties `((upstream-name . "ppx_sexp_conv"))))))+ (define-public ocaml4.07-ppx-variants-conv (package (name "ocaml4.07-ppx-variants-conv")@@ -5107,30 +5121,30 @@ definitions.") (source (origin (method git-fetch) (uri (git-reference- (url "https://github.com/janestreet/ppx_variants_conv")- (commit (string-append "v" version))))+ (url "https://github.com/janestreet/ppx_variants_conv")+ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd")))) (build-system dune-build-system) (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-variantslib" ,ocaml4.07-variantslib)- ("ocaml-migrate-parsetree"- ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))+ `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))+ ("ocaml-variantslib" ,ocaml4.07-variantslib)+ ("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_variants_conv")))+ `((upstream-name . "ppx_variants_conv"))) (home-page- "https://github.com/janestreet/ppx_variants_conv")+ "https://github.com/janestreet/ppx_variants_conv") (synopsis "Generation of accessor and iteration functions for OCaml variant types") (description- "This package generates accessors and iteration functions for OCaml+ "This package generates accessors and iteration functions for OCaml variant types.") (license license:asl2.0))) @@ -5149,7 +5163,7 @@ variant types.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("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))))@@ -5182,7 +5196,7 @@ string conversion.") ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))))@@ -5249,7 +5263,7 @@ storage of large amounts of data.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("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))))@@ -5401,7 +5415,7 @@ many values).") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-here" ,ocaml4.07-ppx-here)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("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))))@@ -5432,7 +5446,7 @@ ocaml values.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-here" ,ocaml4.07-ppx-here)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("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))))@@ -5616,7 +5630,7 @@ position.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare) ("ocaml-ppx-here" ,ocaml4.07-ppx-here)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("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))))@@ -5653,7 +5667,7 @@ useful errors on failure.") ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree"@@ -5758,7 +5772,7 @@ from type definitions.") ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("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))))@@ -6067,7 +6081,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane)- ("ocaml-ppx-sexp-conv" ,ocaml4.07-ppx-sexp-conv)+ ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-splittable-random" ,ocaml4.07-splittable-random)-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 19/43] gnu: Add ocaml-ppx-compare.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-20-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-compare): New variable. (ocaml4.07-ppx-compare): Inherit from ocaml-ppx-compare.--- gnu/packages/ocaml.scm | 64 +++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 26 deletions(-)
Toggle diff (122 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 9289ec88b2..d90b15cbd3 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4941,30 +4941,24 @@ OCaml AST in the OCaml syntax; #t))))) (properties '())))) -(define-public ocaml4.07-ppx-compare+(define-public ocaml-ppx-compare (package- (name "ocaml4.07-ppx-compare")- (version "0.11.1")- (source (origin- (method git-fetch)- (uri (git-reference- (url "https://github.com/janestreet/ppx_compare")- (commit (string-append "v" version))))- (file-name (git-file-name name version))- (sha256- (base32- "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m"))))+ (name "ocaml-ppx-compare")+ (version "0.14.0")+ (source+ (janestreet-origin "ppx_compare" version+ "0mqxa2s194nif7x4fjn1p5gd9i3bakr8nv27gf8x1g5nmi8q9pmp")) (build-system dune-build-system)- (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)))) (arguments- `(#:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))- (properties `((upstream-name . "ppx_compare")))+ ;; Tests are currenlty failing+ ;; (see https://github.com/janestreet/ppx_compare/issues/10)+ '(#:tests? #f))+ (propagated-inputs+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_compare")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-compare)))) (home-page "https://github.com/janestreet/ppx_compare") (synopsis "Generation of comparison functions from types") (description "Generation of fast comparison functions from type expressions@@ -4975,6 +4969,24 @@ flexibility by allowing you to override them for a specific type and more safety by making sure that you only compare comparable values.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-compare+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-compare)+ (name "ocaml-ppx-compare")+ (version "0.11.1")+ (home-page "https://github.com/janestreet/ppx_compare")+ (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+ "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m"))))+ (properties `((upstream-name . "ppx_compare"))))))+ (define-public ocaml4.07-fieldslib (package (name "ocaml4.07-fieldslib")@@ -5193,7 +5205,7 @@ string conversion.") (build-system dune-build-system) (inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare)+ ("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-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))@@ -5262,7 +5274,7 @@ storage of large amounts of data.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare)+ ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))@@ -5630,7 +5642,7 @@ position.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare)+ ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree"@@ -5664,7 +5676,7 @@ useful errors on failure.") (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert)- ("ocaml-ppx-compare" ,ocaml4.07-ppx-compare)+ ("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)@@ -5770,7 +5782,7 @@ from type definitions.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs- `(("ocaml-ppx-compare" ,ocaml4.07-ppx-compare)+ `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate) ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style)-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 20/43] gnu: Add ocaml-ppx-here.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-21-pukkamustard@posteo.net
* 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(-)
Toggle diff (129 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex d90b15cbd3..808e3f30fe 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5352,37 +5352,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")@@ -5426,7 +5428,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))@@ -5457,7 +5459,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))@@ -5612,7 +5614,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))))@@ -5643,7 +5645,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))@@ -5679,7 +5681,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)@@ -5822,7 +5824,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))))@@ -5860,7 +5862,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
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 21/43] gnu: Add ocaml-ppx-cold.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-22-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-cold): New variable.--- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
Toggle diff (35 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 808e3f30fe..a27a1170ac 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5625,6 +5625,28 @@ match expressions, and if expressions.") position.") (license license:asl2.0))) +(define-public ocaml-ppx-cold+ (package+ (name "ocaml-ppx-cold")+ (version "0.14.0")+ (home-page "https://github.com/janestreet/ppx_cold")+ (source+ (janestreet-origin "ppx_cold" version+ "1madfzhpir9amnxmg530n70vll0jrl59vyp71miji73i6b9sy6n2"))+ (build-system dune-build-system)+ (arguments `(#:test-target "tests"))+ (propagated-inputs+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_cold")))+ (synopsis "Syntax extension for indicating cold path")+ (description+ "This package contains an syntax extension to indicate that the code is+on the cold path and should be kept out of the way to avoid polluting the+instruction cache on the hot path. See also+https://github.com/ocaml/ocaml/issues/8563.")+ (license license:expat)))+ (define-public ocaml4.07-ppx-assert (package (name "ocaml4.07-ppx-assert")-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 30/43] gnu: Add ocaml-ppx-optcomp
(address . 47768@debbugs.gnu.org)
20210510051628.15359-31-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-optcomp): New variable. (ocaml4.07-ppx-optcomp): Inherit from ocaml-ppx-optcomp.--- gnu/packages/ocaml.scm | 52 +++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 21 deletions(-)
Toggle diff (81 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex d3fe5b51e9..e3856ac3be 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5570,35 +5570,45 @@ context such as function arguments.") else expression.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-optcomp+(define-public ocaml-ppx-optcomp (package- (name "ocaml4.07-ppx-optcomp")- (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_optcomp-v" version ".tar.gz"))- (sha256- (base32- "1bb52p2j2h4s9f06vrcpla80rj93jinnzq6jzilapyx9q068929i"))))+ (name "ocaml-ppx-optcomp")+ (version "0.14.1")+ (home-page "https://github.com/janestreet/ppx_optcomp")+ (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+ "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4")))) (build-system dune-build-system)- (arguments- `(#:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune)) (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio))- ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))- (properties `((upstream-name . "ppx_optcomp")))- (home-page "https://github.com/janestreet/ppx_optcomp")+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-stdio" ,ocaml-stdio)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_optcomp")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-optcomp)))) (synopsis "Optional compilation for OCaml") (description "Ppx_optcomp stands for Optional Compilation. It is a tool used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, ...") (license license:asl2.0))) +(define-public ocaml4.07-ppx-optcomp+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-optcomp)+ (version "0.11.0")+ (source+ (janestreet-origin+ "ppx_optcomp" version+ "1bb52p2j2h4s9f06vrcpla80rj93jinnzq6jzilapyx9q068929i"))+ (properties `((upstream-name . "ppx_optcomp"))))))+ (define-public ocaml-ppx-let (package (name "ocaml-ppx-let")@@ -5944,7 +5954,7 @@ functions from type definitions.") ("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)+ ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional) ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message)-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 17/43] gnu: Add ocaml-ppx-let.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-18-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-let): New variable. (ocaml4.07-ppx-let): Inherit from ocaml-ppx-let.--- gnu/packages/ocaml.scm | 44 ++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-)
Toggle diff (73 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex f252fb53fa..54a755212e 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5550,35 +5550,37 @@ used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, ...") (license license:asl2.0))) -(define-public ocaml4.07-ppx-let+(define-public ocaml-ppx-let (package- (name "ocaml4.07-ppx-let")- (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_let-v" version ".tar.gz"))- (sha256- (base32- "1wdfw6w4xbg97a35yg6bif9gggxniy9ddnrjfw1a0inkl2yamxkj"))))+ (name "ocaml-ppx-let")+ (version "0.14.0")+ (source+ (janestreet-origin "ppx_let" version+ "1qcrnd86pbr1di5m6z4ps4p15qawwa02jxwz3xfd82hdbjmdwf1s")) (build-system dune-build-system)- (arguments- `(#:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune)) (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_let")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_let")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-let)))) (home-page "https://github.com/janestreet/ppx_let") (synopsis "Monadic let-bindings") (description "A ppx rewriter for monadic and applicative let bindings, match expressions, and if expressions.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-let+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-let)+ (version "0.11.0")+ (source+ (janestreet-origin "ppx_let" version+ "1wdfw6w4xbg97a35yg6bif9gggxniy9ddnrjfw1a0inkl2yamxkj"))++ (properties `(upstream-name . "ppx_let")))))+ (define-public ocaml4.07-ppx-fail (package (name "ocaml4.07-ppx-fail")@@ -5848,7 +5850,7 @@ functions from type definitions.") ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)- ("ocaml-ppx-let" ,ocaml4.07-ppx-let)+ ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,ocaml4.07-ppx-optcomp) ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional) ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang)-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 32/43] gnu: Add ocaml-jst-config.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-33-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-jst-config): New variable.--- gnu/packages/ocaml.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-)
Toggle diff (46 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex b38ce9fcc8..5334d8530d 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4128,6 +4128,30 @@ Dedukti files.") syntax checking on dedukti files.") (license license:cecill-b)))) +(define-public ocaml-jst-config+ (package+ (name "ocaml-jst-config")+ (version "0.14.0")+ (source+ (janestreet-origin+ "jst-config" version+ "1fppr29vn91zpqda8jlnp8bcssd4bf3rn36ig8fnd1yhjrsvz8f6"))+ (build-system dune-build-system)+ (arguments '(#:tests? #f)) ; no tests+ (propagated-inputs+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-ppx-assert" ,ocaml-ppx-assert)+ ("ocaml-stdio" ,ocaml-stdio)+ ("dune-configurator" ,dune-configurator)))+ (home-page "https://github.com/janestreet/jst-config")+ (synopsis "Compile-time configuration for Jane Street libraries")+ (description "Defines compile-time constants used in Jane Street libraries+such as Base, Core, and Async. This package has an unstable interface; it is+intended only to share configuration between different packages from Jane+Street. Future updates may not be backward-compatible, and we do not+recommend using this package directly.")+ (license license:expat)))+ (define-public ocaml4.07-ppx-inline-test (package (name "ocaml4.07-ppx-inline-test")@@ -4145,7 +4169,7 @@ syntax checking on dedukti files.") "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50")))) (build-system dune-build-system) (arguments- ;see home page README for further information+ ;see home page README for further information `(#:tests? #f #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 18/43] gnu: Add ocaml-syntax-shims.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-19-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-syntax-shims): New variable.--- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
Toggle diff (35 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 54a755212e..9289ec88b2 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -6615,3 +6615,28 @@ exposed the intrinsics properly, the compiler doesn't have any fast blits between Bigstrings and other string-like types. @code{bigstringaf} provides these missing pieces.") (license license:bsd-3)))++(define-public ocaml-syntax-shims+ (package+ (name "ocaml-syntax-shims")+ (version "1.0.0")+ (home-page "https://github.com/ocaml-ppx/ocaml-syntax-shims")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url home-page)+ (commit version)))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "0l1i8z95qgb0lxlrv3yb5nkp391hqsiyi4r91p12k3xmggqixagf"))))+ (build-system dune-build-system)+ (properties+ `((upstream-name . "ocaml-syntax-shims")))+ (synopsis+ "Backport new syntax to older OCaml versions")+ (description+ "This packages backports new features of the language to older+compilers, such as let+.")+ (license license:expat)))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 33/43] gnu: Add ocaml-jane-street-headers.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-34-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-jane-street-headers): New variable.--- gnu/packages/ocaml.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
Toggle diff (29 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 5334d8530d..449ff00cf1 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4152,6 +4152,22 @@ Street. Future updates may not be backward-compatible, and we do not recommend using this package directly.") (license license:expat))) +(define-public ocaml-jane-street-headers+ (package+ (name "ocaml-jane-street-headers")+ (version "0.14.0")+ (source+ (janestreet-origin+ "jane-street-headers" version+ "028yxb4h3iy025iy89v8653m5brh7flrjshghs4x99pd690pmfs7"))+ (build-system dune-build-system)+ (arguments '(#:tests? #f)) ; no tests+ (home-page "https://github.com/janestreet/jane-street-headers")+ (synopsis "Jane Street C header files")+ (description "C header files shared between the various Jane Street+packages.")+ (license license:expat)))+ (define-public ocaml4.07-ppx-inline-test (package (name "ocaml4.07-ppx-inline-test")-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 22/43] gnu: Add ocaml-ppx-assert.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-23-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-assert): New variable. (ocaml4.07-ppx-assert): Inherit from ocaml-ppx-assert.--- gnu/packages/ocaml.scm | 63 ++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 27 deletions(-)
Toggle diff (113 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex a27a1170ac..799bebeba9 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5647,38 +5647,47 @@ instruction cache on the hot path. See also https://github.com/ocaml/ocaml/issues/8563.") (license license:expat))) -(define-public ocaml4.07-ppx-assert+(define-public ocaml-ppx-assert (package- (name "ocaml4.07-ppx-assert")- (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_assert-v" version ".tar.gz"))- (sha256- (base32- "17kd311n0l9f72gblf9kv8i5rghr106w37x4f0m5qwh6nlgl0j9k"))))+ (name "ocaml-ppx-assert")+ (version "0.14.0")+ (source+ (janestreet-origin "ppx_assert" version+ "1l2rr4jz2q5b35ryn2z146z7m9v6k8krp5gpn8ilib66mnz5zx15")) (build-system dune-build-system)- (arguments- `(#:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune)) (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare))- ("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))- ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))- (properties `((upstream-name . "ppx_assert")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-ppx-cold" ,ocaml-ppx-cold)+ ("ocaml-ppx-compare" ,ocaml-ppx-compare)+ ("ocaml-ppx-here" ,ocaml-ppx-here)+ ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_assert")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-assert)))) (home-page "https://github.com/janestreet/ppx_assert") (synopsis "Assert-like extension nodes that raise useful errors on failure") (description "This package contains assert-like extension nodes that raise useful errors on failure.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-assert+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-assert)+ (version "0.11.0")+ (source+ (janestreet-origin "ppx_assert" version+ "17kd311n0l9f72gblf9kv8i5rghr106w37x4f0m5qwh6nlgl0j9k"))+ (propagated-inputs+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-ppx-compare" ,ocaml-ppx-compare)+ ("ocaml-ppx-here" ,ocaml-ppx-here)+ ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_assert"))))))+ (define-public ocaml4.07-ppx-expect (package (name "ocaml4.07-ppx-expect")@@ -5699,7 +5708,7 @@ useful errors on failure.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert)+ ("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-fields-conv" ,ocaml4.07-ppx-fields-conv)@@ -5876,7 +5885,7 @@ functions from type definitions.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs- `(("ocaml-ppx-assert" ,ocaml4.07-ppx-assert)+ `(("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot)@@ -6072,7 +6081,7 @@ thousands of times faster than fork. `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-configurator" ,ocaml4.07-configurator) ("ocaml-core-kernel" ,ocaml4.07-core-kernel)- ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert)+ ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-spawn" ,ocaml4.07-spawn)@@ -6114,7 +6123,7 @@ standard library that was developed by Jane Street.") ("ocaml-configurator" ,ocaml4.07-configurator) ("ocaml-fieldslib" ,ocaml4.07-fieldslib) ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers)- ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert)+ ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 23/43] gnu: Add ocaml-ppx-custom-printf.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-24-pukkamustard@posteo.net
* 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(-)
Toggle diff (101 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 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
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 31/43] gnu: Add ocaml-ppx-optional.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-32-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-optional): New variable. (ocaml4.07-ppx-optional): Inherit from ocaml-ppx-optional.--- gnu/packages/ocaml.scm | 48 ++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 23 deletions(-)
Toggle diff (78 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex e3856ac3be..b38ce9fcc8 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5538,31 +5538,22 @@ context such as function arguments.") @code{|>} and @code{|!}.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-optional+(define-public ocaml-ppx-optional (package- (name "ocaml4.07-ppx-optional")- (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_optional-v" version ".tar.gz"))- (sha256- (base32- "1z8z2bga95k2vksljljfglg10vygkjd24kn1b37sk4z3nmp47x0h"))))+ (name "ocaml-ppx-optional")+ (version "0.14.0")+ (source+ (janestreet-origin+ "ppx_optional" version+ "1hh6ivlp1qpvyn8l0vhrahkkcp3scf7km254sgplprmk10wnyidz")) (build-system dune-build-system)- (arguments- ;; No tests- `(#:tests? #f- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ (arguments `(#:tests? #f)) ; No tests (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_optional")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_optional")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-optional)))) (home-page "https://github.com/janestreet/ppx_optional") (synopsis "Pattern matching on flat options") (description@@ -5570,6 +5561,17 @@ context such as function arguments.") else expression.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-optional+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-optional)+ (version "0.11.0")+ (source+ (janestreet-origin+ "ppx_optional" version+ "1z8z2bga95k2vksljljfglg10vygkjd24kn1b37sk4z3nmp47x0h"))+ (properties `((upstream-name . "ppx_optional"))))))+ (define-public ocaml-ppx-optcomp (package (name "ocaml-ppx-optcomp")@@ -5955,7 +5957,7 @@ functions from type definitions.") ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp))- ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional)+ ("ocaml-ppx-optional" ,(package-with-ocaml4.07 ocaml-ppx-optional)) ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value)-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 24/43] gnu: Add ocaml-ppx-hash.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-25-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-hash): New variable. (ocaml4.07-ppx-hash): Inherit from ocaml-ppx-hash.--- gnu/packages/ocaml.scm | 72 +++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 32 deletions(-)
Toggle diff (125 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex c4babb30f3..792cf38447 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5267,38 +5267,46 @@ storage of large amounts of data.") (description "Octavius is a library to parse the `ocamldoc` comment syntax.") (license license:isc))) -(define-public ocaml4.07-ppx-hash+(define-public ocaml-ppx-hash (package- (name "ocaml4.07-ppx-hash")- (version "0.11.1")- (source (origin- (method git-fetch)- (uri (git-reference- (url "https://github.com/janestreet/ppx_hash")- (commit (string-append "v" version))))- (file-name (git-file-name name version))- (sha256- (base32- "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p"))))+ (name "ocaml-ppx-hash")+ (version "0.14.0")+ (source+ (janestreet-origin "ppx_hash" version+ "0x4wgdvhgd8a49bzari52jpkykxpv6ncgp5ncda3xgg0a9r49s8n")) (build-system dune-build-system) (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare))- ("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_hash")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-ppx-compare" ,ocaml-ppx-compare)+ ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_hash")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-hash)))) (home-page "https://github.com/janestreet/ppx_hash") (synopsis "Generation of hash functions from type expressions and definitions") (description "This package is a collection of ppx rewriters that generate hash functions from type exrpessions and definitions.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-hash+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-hash)+ (name "ocaml-ppx-hash")+ (home-page "https://github.com/janestreet/ppx_hash")+ (version "0.11.1")+ (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+ "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p"))))+ (properties `((upstream-name . "ppx_hash"))))))+ (define-public ocaml4.07-ppx-enumerate (package (name "ocaml4.07-ppx-enumerate")@@ -5306,23 +5314,23 @@ hash functions from type exrpessions and definitions.") (source (origin (method git-fetch) (uri (git-reference- (url "https://github.com/janestreet/ppx_enumerate")- (commit (string-append "v" version))))+ (url "https://github.com/janestreet/ppx_enumerate")+ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) (build-system dune-build-system) (arguments- `(#:tests? #f; no test suite+ `(#:tests? #f ; no test suite #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (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))))+ `(("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_enumerate"))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type")@@ -5826,7 +5834,7 @@ from type definitions.") (propagated-inputs `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate)- ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash)+ ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-migrate-parsetree"@@ -6134,7 +6142,7 @@ standard library that was developed by Jane Street.") ("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-hash" ,ocaml4.07-ppx-hash)+ ("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) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 16/43] gnu: Add ocaml-bigstringaf.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-17-pukkamustard@posteo.net
* gnu/ocaml/packages.scm (ocaml-bigstringaf): New variable.--- gnu/packages/ocaml.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)
Toggle diff (44 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 823cb00afd..f252fb53fa 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -6579,3 +6579,37 @@ provides support to program with time varying values: declarative events and signals. React doesn't define any primitive event or signal, it lets the client chooses the concrete timeline.") (license license:lgpl2.1+)))++(define-public ocaml-bigstringaf+ (package+ (name "ocaml-bigstringaf")+ (version "0.7.0")+ (home-page "https://github.com/inhabitedtype/bigstringaf")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url home-page)+ (commit version)))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "1q1sqxzdnlrpl95ccrhl7lwy3zswgd9rbn19ildclh0lyi2vazbj"))))+ (build-system dune-build-system)+ (arguments+ '(#:test-target "."))+ (propagated-inputs+ `(("ocaml-bigarray-compat" ,ocaml-bigarray-compat)))+ (native-inputs+ `(("ocaml-alcotest" ,ocaml-alcotest)+ ("pkg-config" ,pkg-config)))+ (synopsis+ "Bigstring intrinsics and fast blits based on memcpy/memmove")+ (description+ "The OCaml compiler has a bunch of intrinsics for Bigstrings, but they're+not widely-known, sometimes misused, and so programs that use Bigstrings are+slower than they have to be. And even if a library got that part right and+exposed the intrinsics properly, the compiler doesn't have any fast blits+between Bigstrings and other string-like types. @code{bigstringaf} provides+these missing pieces.")+ (license license:bsd-3)))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 34/43] gnu: Add ocaml-time-now.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-35-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-time-now): New variable.--- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
Toggle diff (38 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 449ff00cf1..43c6c7ae0f 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4168,6 +4168,31 @@ recommend using this package directly.") packages.") (license license:expat))) +(define-public ocaml-time-now+ (package+ (name "ocaml-time-now")+ (version "0.14.0")+ (source+ (janestreet-origin+ "time_now" version+ "0hkn2jw4dz5gflnsblskl5wp6z7zbrahwjmaxmsskfviwjg82cqh"))+ (build-system dune-build-system)+ (arguments '(#:tests? #f)) ; no tests+ (propagated-inputs+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-jane-street-headers" ,ocaml-jane-street-headers)+ ("ocaml-jst-config" ,ocaml-jst-config)+ ("ocaml-ppx-base" ,ocaml-ppx-base)+ ("ocaml-ppx-optcomp" ,ocaml-ppx-optcomp)))+ (properties `((upstream-name . "time_now")))+ (home-page+ "https://github.com/janestreet/time_now")+ (synopsis "Reports the current time")+ (description+ "Provides a single function to report the current time in nanoseconds+since the start of the Unix epoch.")+ (license license:expat)))+ (define-public ocaml4.07-ppx-inline-test (package (name "ocaml4.07-ppx-inline-test")-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 25/43] gnu: Add ocaml-ppx-enumerate.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-26-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-enumerate): New variable. (ocaml4.07-ppx-enumerate): Inherit from ocaml-ppx-enumerate.--- gnu/packages/ocaml.scm | 54 +++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 22 deletions(-)
Toggle diff (85 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 792cf38447..8bed1ae1a5 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5307,31 +5307,23 @@ hash functions from type exrpessions and definitions.") "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p")))) (properties `((upstream-name . "ppx_hash")))))) -(define-public ocaml4.07-ppx-enumerate+(define-public ocaml-ppx-enumerate (package- (name "ocaml4.07-ppx-enumerate")- (version "0.11.1")- (source (origin- (method git-fetch)- (uri (git-reference- (url "https://github.com/janestreet/ppx_enumerate")- (commit (string-append "v" version))))- (file-name (git-file-name name version))- (sha256- (base32- "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr"))))+ (name "ocaml-ppx-enumerate")+ (version "0.14.0")+ (source+ (janestreet-origin+ "ppx_enumerate" version+ "1ij6sffgqhnjwnj9brhrrw1c6xgxlh0s6r17x1qkgnyrc73gfsz8")) (build-system dune-build-system) (arguments- `(#:tests? #f ; no test suite- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ `(#:tests? #f)) ; no test suite (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_enumerate")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_enumerate")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-enumerate)))) (home-page "https://github.com/janestreet/ppx_enumerate") (synopsis "Generate a list containing all values of a finite type") (description "Ppx_enumerate is a ppx rewriter which generates a definition@@ -5339,6 +5331,24 @@ for the list of all values of a type (for a type which only has finitely many values).") (license license:asl2.0))) +(define-public ocaml4.07-ppx-enumerate+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-enumerate)+ (name "ocaml-ppx-enumerate")+ (version "0.11.1")+ (home-page "https://github.com/janestreet/ppx_enumerate")+ (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+ "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr"))))+ (properties `((upstream-name . "ppx_enumerate"))))))+ (define-public ocaml4.07-ppx-bench (package (name "ocaml4.07-ppx-bench")@@ -5833,7 +5843,7 @@ from type definitions.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare))- ("ocaml-ppx-enumerate" ,ocaml4.07-ppx-enumerate)+ ("ocaml-ppx-enumerate" ,(package-with-ocaml4.07 ocaml-ppx-enumerate)) ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) ("ocaml-ppx-js-style" ,ocaml4.07-ppx-js-style) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 26/43] gnu: Add ocaml-ppx-js-style.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-27-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-js-style): New variable. (ocaml4.07-ppx-js-style): Inherit from ocaml-ppx-js-style.--- gnu/packages/ocaml.scm | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-)
Toggle diff (78 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 8bed1ae1a5..309e9c7601 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5758,32 +5758,22 @@ output-generating code, interleaved with @code{%expect} extension expressions to denote the expected output.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-js-style+(define-public ocaml-ppx-js-style (package- (name "ocaml4.07-ppx-js-style")- (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_js_style-v" version ".tar.gz"))- (sha256- (base32- "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2"))))+ (name "ocaml-ppx-js-style")+ (version "0.14.0")+ (source+ (janestreet-origin "ppx_js_style" version+ "141fgxfipfn5jdaxc946dmp5y4fcnbhxms9maji9ddywgx82ya7l")) (build-system dune-build-system)- (arguments- ;; No tests- `(#:tests? #f- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ (arguments `(#:tests? #f)) ; No tests (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-migrate-parsetree"- ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("ocaml-octavius" ,(package-with-ocaml4.07 ocaml-octavius))- ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))- (properties `((upstream-name . "ppx_js_style")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-octavius" ,ocaml-octavius)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_js_style")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-js-style)))) (home-page "https://github.com/janestreet/ppx_js_style") (synopsis "Code style checker for Jane Street Packages") (description "This package is a no-op ppx rewriter. It is used as a@@ -5791,6 +5781,16 @@ to denote the expected output.") packages.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-js-style+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-js-style)+ (version "0.11.0")+ (source+ (janestreet-origin "ppx_js_style" version+ "0z3fc55jdjhhsblla6z4fqc13kljpcz29q79rvs5h2vsraqrldr2"))+ (properties `((upstream-name . "ppx_js_style"))))))+ (define-public ocaml4.07-ppx-typerep-conv (package (name "ocaml4.07-ppx-typerep-conv")@@ -5845,7 +5845,7 @@ from type definitions.") `(("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" ,ocaml4.07-ppx-js-style)+ ("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))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 36/43] gnu: Add ocaml-angstrom.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-37-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-angstrom): New variable.--- gnu/packages/ocaml.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
Toggle diff (47 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex e91c2e14b3..24bfb8cf37 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -6833,3 +6833,40 @@ these missing pieces.") "This packages backports new features of the language to older compilers, such as let+.") (license license:expat)))++(define-public ocaml-angstrom+ (package+ (name "ocaml-angstrom")+ (version "0.15.0")+ (home-page "https://github.com/inhabitedtype/angstrom")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url home-page)+ (commit version)))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh"))))+ (build-system dune-build-system)+ (arguments+ ;; Only build the base angstrom package.+ '(#:package "angstrom"+ #:test-target "."))+ (propagated-inputs+ `(("ocaml-bigstringaf" ,ocaml-bigstringaf)))+ (native-inputs+ `(("ocaml-alcotest" ,ocaml-alcotest)+ ("ocaml-ppx-let" ,ocaml-ppx-let)+ ("ocaml-syntax-shims" ,ocaml-syntax-shims)))+ (synopsis "Parser combinators built for speed and memory-efficiency")+ (description+ "Angstrom is a parser-combinator library that makes it easy to write+efficient, expressive, and reusable parsers suitable for high-performance+applications. It exposes monadic and applicative interfaces for composition,+and supports incremental input through buffered and unbuffered interfaces.+Both interfaces give the user total control over the blocking behavior of+their application, with the unbuffered interface enabling zero-copy IO.+Parsers are backtracking by default and support unbounded lookahead.")+ (license license:bsd-3)))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 37/43] gnu: Add ocaml-uri.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-38-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-uri): New variable.--- gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
Toggle diff (50 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 24bfb8cf37..c390a8bce9 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -3403,6 +3403,35 @@ the need to write signal code, which is useful for quick scripts that manipulate JSON.") (license license:isc))) +(define-public ocaml-uri+ (package+ (name "ocaml-uri")+ (version "4.1.0")+ (home-page "https://github.com/mirage/ocaml-uri")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url home-page)+ (commit (string-append "v" version))))+ (sha256+ (base32+ "10bf28my1yhj8a2d7bkgbna9j20wq0ghp92k926y29bmjj2qh0l7"))))+ (build-system dune-build-system)+ (arguments '(#:package "uri"+ #:test-target "."))+ (propagated-inputs+ `(("ocaml-stringext" ,ocaml-stringext)+ ("ocaml-angstrom" ,ocaml-angstrom)))+ (native-inputs+ `(("ocaml-ounit" ,ocaml-ounit)+ ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv)))+ (properties `((upstream-name . "uri")+ (ocaml4.07-variant ,(delay ocaml4.07-uri))))+ (synopsis "RFC3986 URI/URL parsing library")+ (description "OCaml-uri is a library for parsing URI/URL in the RFC3986 format.")+ (license license:isc)))+ (define-public ocaml4.07-uri (package (name "ocaml4.07-uri")@@ -3435,6 +3464,7 @@ JSON.") `(("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) ("ocaml-stringext" ,(package-with-ocaml4.07 ocaml-stringext))))+ (properties `((upstream-name . "uri"))) (home-page "https://github.com/mirage/ocaml-uri") (synopsis "RFC3986 URI/URL parsing library") (description "OCaml-uri is a library for parsing URI/URL in the RFC3986 format.")-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 35/43] gnu: Add ocaml-ppx-inline-test.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-36-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-inline-test): New variable. (ocaml4.07-ppx-inline-test): Inherit from ocaml-ppx-inline-test.--- gnu/packages/ocaml.scm | 69 ++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 23 deletions(-)
Toggle diff (133 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 43c6c7ae0f..e91c2e14b3 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4193,10 +4193,10 @@ packages.") since the start of the Unix epoch.") (license license:expat))) -(define-public ocaml4.07-ppx-inline-test+(define-public ocaml-ppx-inline-test (package- (name "ocaml4.07-ppx-inline-test")- (version "0.12.0")+ (name "ocaml-ppx-inline-test")+ (version "0.14.1") (home-page "https://github.com/janestreet/ppx_inline_test") (source (origin@@ -4207,29 +4207,52 @@ since the start of the Unix epoch.") (file-name (git-file-name name version)) (sha256 (base32- "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50"))))+ "1ajdna1m9l1l3nfigyy33zkfa3yarfr6s086jdw2pcfwlq1fhhl4")))) (build-system dune-build-system) (arguments- ;see home page README for further information- `(#:tests? #f- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))- (inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-migrate-parsetree"- ,(package-with-ocaml4.07 ocaml-migrate-parsetree))- ("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" ,(package-with-ocaml4.07 ocaml-ppxlib))))- (properties `((upstream-name . "ppx_inline_test")))+ `(#:tests? #f)) ;see home page README for further information+ (propagated-inputs+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-compiler-libs" ,ocaml-compiler-libs)+ ("ocaml-sexplib0" ,ocaml-sexplib0)+ ("ocaml-stdio" ,ocaml-stdio)+ ("ocaml-ppxlib" ,ocaml-ppxlib)+ ("ocaml-time-now" ,ocaml-time-now)))+ (properties `((upstream-name . "ppx_inline_test")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-inline-test)))) (synopsis "Syntax extension for writing in-line tests in ocaml code") (description "This package contains a syntax extension for writing in-line tests in ocaml code. It is part of Jane Street's PPX rewriters collection.") (license license:expat))) +(define-public ocaml4.07-ppx-inline-test+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-inline-test)+ (name "ocaml-ppx-inline-test")+ (version "0.12.0")+ (home-page "https://github.com/janestreet/ppx_inline_test")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url (string-append home-page ".git"))+ (commit (string-append "v" version))))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50"))))+ (propagated-inputs+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-compiler-libs" ,ocaml-compiler-libs)+ ("ocaml-sexplib0" ,ocaml-sexplib0)+ ("ocaml-stdio" ,ocaml-stdio)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_inline_test"))))))+ (define-public ocaml-bindlib (package (name "ocaml-bindlib")@@ -4246,7 +4269,7 @@ collection.") "1f8kr81w8vsi4gv61xn1qbc6zrzkjp8l9ix0942vjh4gjxc74v75")))) (build-system ocaml-build-system) (arguments- `(#:tests? #f ;no tests+ `(#:tests? #f ;no tests #:use-make? #t #:phases (modify-phases %standard-phases@@ -5442,7 +5465,7 @@ many values).") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs- `(("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)+ `(("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))@@ -5825,7 +5848,7 @@ useful errors on failure.") ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here))- ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)+ ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio))@@ -6019,7 +6042,7 @@ functions from type definitions.") ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here))- ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)+ ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) ("ocaml-ppx-optional" ,(package-with-ocaml4.07 ocaml-ppx-optional))@@ -6251,7 +6274,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("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-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message)-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 27/43] gnu: Add ocaml-ppx-base.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-28-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-base): New variable. (ocaml4.07-ppx-base): Inherit from ocaml-ppx-base.--- gnu/packages/ocaml.scm | 65 +++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 26 deletions(-)
Toggle diff (103 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 309e9c7601..458bc117cf 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5823,34 +5823,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.@@ -5859,6 +5853,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")@@ -5913,7 +5926,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))@@ -6151,7 +6164,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)-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 38/43] gnu: Add ocaml-graphics.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-39-pukkamustard@posteo.net
From: divoplade <d@divoplade.fr>
* gnu/packages/ocaml.scm (ocaml-graphics): New variable.
Co-Authored-By: pukkamustard <pukkamustard@posteo.net>--- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
Toggle diff (36 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex c390a8bce9..4727b294d9 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -6900,3 +6900,29 @@ Both interfaces give the user total control over the blocking behavior of their application, with the unbuffered interface enabling zero-copy IO. Parsers are backtracking by default and support unbounded lookahead.") (license license:bsd-3)))++(define-public ocaml-graphics+ (package+ (name "ocaml-graphics")+ (version "5.1.1")+ (home-page "https://github.com/ocaml/graphics")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url home-page)+ (commit version)))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "14w07ydji2nbdk366nfp2pzs9484xp9vqv63n345id13v48z8bfi"))))+ (build-system dune-build-system)+ (propagated-inputs+ `(("libx11" ,libx11)))+ (synopsis "The OCaml graphics library")+ (description+ "The graphics library provides a set of portable drawing primitives.+Drawing takes place in a separate window that is created when+Graphics.open_graph is called. This library used to be distributed with OCaml+up to OCaml 4.08.")+ (license license:lgpl2.1+)))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 28/43] gnu: Add ocaml-fieldslib.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-29-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-fieldslib): New variable. (ocaml4.07-fieldslib): Inherit from ocaml-fieldslib.--- gnu/packages/ocaml.scm | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-)
Toggle diff (85 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 458bc117cf..aa8437985e 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -4987,31 +4987,21 @@ by making sure that you only compare comparable values.") "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m")))) (properties `((upstream-name . "ppx_compare")))))) -(define-public ocaml4.07-fieldslib+(define-public ocaml-fieldslib (package- (name "ocaml4.07-fieldslib")- (version "0.11.0")- (source (origin- (method url-fetch)- (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v"- (version-major+minor version) "/files/"- "fieldslib-v" version ".tar.gz"))- (sha256- (base32- "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388"))))+ (name "ocaml-fieldslib")+ (version "0.14.0")+ (source (janestreet-origin+ "fieldslib" version+ "10n5y376fb5jgqk9h8vq158rm1b36h9lzh6p11q33h6xgvb1v6n3")) (build-system dune-build-system)- (arguments- ;; No tests- `(#:tests? #f- #:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune))+ (arguments `(#:tests? #f)) ; No tests (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 . "fieldslib")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "fieldslib")+ (ocaml4.07-variant . ,(delay ocaml4.07-fieldslib)))) (home-page "https://github.com/janestreet/fieldslib") (synopsis "Syntax extension to record fields") (description "Syntax extension to define first class values representing@@ -5019,6 +5009,16 @@ record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) +(define-public ocaml4.07-fieldslib+ (package-with-ocaml4.07+ (package+ (inherit ocaml-fieldslib)+ (version "0.11.0")+ (source (janestreet-origin+ "fieldslib" version+ "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388"))+ (properties `((upstream-name . "fieldslib"))))))+ (define-public ocaml4.07-variantslib (package (name "ocaml4.07-variantslib")@@ -5065,7 +5065,7 @@ standard library.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-fieldslib" ,ocaml4.07-fieldslib)+ ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))@@ -6161,7 +6161,7 @@ standard library that was developed by Jane Street.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-bin-prot" ,ocaml4.07-bin-prot) ("ocaml-configurator" ,ocaml4.07-configurator)- ("ocaml-fieldslib" ,ocaml4.07-fieldslib)+ ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib)) ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 29/43] gnu: Add ocaml-ppx-fields-conv.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-30-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-fields-conv): New variable. (ocaml4.07-ppx-fields-conv): Inherit from ocaml-ppx-fields-conv.--- gnu/packages/ocaml.scm | 58 ++++++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 25 deletions(-)
Toggle diff (102 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex aa8437985e..d3fe5b51e9 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5050,31 +5050,29 @@ of a record and create new record values.") standard library.") (license license:asl2.0))) -(define-public ocaml4.07-ppx-fields-conv+(define-public ocaml-ppx-fields-conv (package- (name "ocaml4.07-ppx-fields-conv")- (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_fields_conv-v" version ".tar.gz"))- (sha256- (base32- "07zrd3qky2ppbfl55gpm90rvqa5860xgwcsvihrjmkrw6d0jirkc"))))+ (name "ocaml-ppx-fields-conv")+ (version "0.14.2")+ (home-page "https://github.com/janestreet/ppx_fields_conv")+ (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+ "1zwirwqry24b48bg7d4yc845hvcirxyymzbw95aaxdcck84d30n8")))) (build-system dune-build-system) (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-fieldslib" ,(package-with-ocaml4.07 ocaml-fieldslib))- ("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_fields_conv")))- (home-page "https://github.com/janestreet/ppx_fields_conv")+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-fieldslib" ,ocaml-fieldslib)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "ppx_fields_conv")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-fields-conv)))) (synopsis "Generation of accessor and iteration functions for ocaml records") (description "Ppx_fields_conv is a ppx rewriter that can be used to define first class values representing record fields, and additional routines, to get@@ -5082,6 +5080,16 @@ and set record fields, iterate and fold over all fields of a record and create new record values.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-fields-conv+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-fields-conv)+ (version "0.11.0")+ (source (janestreet-origin+ "ppx_fields_conv" version+ "07zrd3qky2ppbfl55gpm90rvqa5860xgwcsvihrjmkrw6d0jirkc"))+ (properties `((upstream-name . "ppx_fields_conv"))))))+ (define-public ocaml-ppx-sexp-conv (package (name "ocaml-ppx-sexp-conv")@@ -5216,7 +5224,7 @@ string conversion.") `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf))- ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv)+ ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-migrate-parsetree"@@ -5738,7 +5746,7 @@ useful errors on failure.") ("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" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf))- ("ocaml-ppx-fields-conv" ,ocaml4.07-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-inline-test" ,ocaml4.07-ppx-inline-test) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))@@ -5932,7 +5940,7 @@ functions from type definitions.") ("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)+ ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("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))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 40/43] gnu: Add ocaml-ppx-variants-conv.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-41-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-variants-conv): New variable. (ocaml4.07-ppx-variants-conv): Inherit from ocaml-ppx-variants-conv.--- gnu/packages/ocaml.scm | 65 ++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 25 deletions(-)
Toggle diff (110 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex e40bc78db2..019bfea9f9 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5260,32 +5260,29 @@ definitions.") "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9")))) (properties `((upstream-name . "ppx_sexp_conv")))))) -(define-public ocaml4.07-ppx-variants-conv+(define-public ocaml-ppx-variants-conv (package- (name "ocaml4.07-ppx-variants-conv")- (version "0.11.1")- (source (origin- (method git-fetch)- (uri (git-reference- (url "https://github.com/janestreet/ppx_variants_conv")- (commit (string-append "v" version))))- (file-name (git-file-name name version))- (sha256- (base32- "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd"))))+ (name "ocaml-ppx-variants-conv")+ (version "0.14.1")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url "https://github.com/janestreet/ppx_variants_conv")+ (commit (string-append "v" version))))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "0q6a43zrwqzdz7aja0k44a2llyjjj5xzi2kigwhsnww3g0r5ig84")))) (build-system dune-build-system) (propagated-inputs- `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib))- ("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))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-variantslib" ,ocaml-variantslib)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib))) (properties- `((upstream-name . "ppx_variants_conv")))+ `((upstream-name . "ppx_variants_conv")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-variants-conv)))) (home-page "https://github.com/janestreet/ppx_variants_conv") (synopsis "Generation of accessor and iteration functions for OCaml variant types")@@ -5294,6 +5291,24 @@ definitions.") variant types.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-variants-conv+ (package-with-ocaml4.07+ (package+ (inherit ocaml-ppx-variants-conv)+ (name "ocaml-ppx-variants-conv")+ (version "0.11.1")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url "https://github.com/janestreet/ppx_variants_conv")+ (commit (string-append "v" version))))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd"))))+ (properties `((upstream-name . "ppx_variants_conv"))))))+ (define-public ocaml-ppx-custom-printf (package (name "ocaml-ppx-custom-printf")@@ -5352,7 +5367,7 @@ string conversion.") ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))- ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv)+ ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) (arguments@@ -5888,7 +5903,7 @@ useful errors on failure.") ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))- ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv)+ ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree))@@ -6088,7 +6103,7 @@ functions from type definitions.") ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) ("ocaml-ppx-sexp-value" ,ocaml4.07-ppx-sexp-value) ("ocaml-ppx-typerep-conv" ,ocaml4.07-ppx-typerep-conv)- ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv)+ ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 41/43] gnu: Add ocaml-ppx-expect.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-42-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-ppx-expect): New variable. (ocaml4.07-ppx-expect): Inherit from ocaml-ppx-expect.--- gnu/packages/ocaml.scm | 83 +++++++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 34 deletions(-)
Toggle diff (127 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 019bfea9f9..c4a024c850 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -3791,7 +3791,7 @@ library is currently designed for Unicode Standard 3.2.") `(("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) ("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)))) (native-inputs- `(("ocaml-ppx-expect" ,ocaml4.07-ppx-expect)))+ `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)))) (properties `((upstream-name . "charInfo_width"))) (home-page "https://bitbucket.org/zandoye/charinfo_width/")@@ -5876,40 +5876,31 @@ useful errors on failure.") ("ocaml-ppxlib" ,ocaml-ppxlib))) (properties `((upstream-name . "ppx_assert")))))) -(define-public ocaml4.07-ppx-expect+(define-public ocaml-ppx-expect (package- (name "ocaml4.07-ppx-expect")- (version "0.12.0")- (source (origin- (method git-fetch)- (uri (git-reference- (url "https://github.com/janestreet/ppx_expect")- (commit (string-append "v" version))))- (file-name (git-file-name name version))- (sha256- (base32- "1wawsbjfkri4sw52n8xqrzihxc3xfpdicv3ahz83a1rsn4lb8j5q"))))+ (name "ocaml-ppx-expect")+ (version "0.14.1")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url "https://github.com/janestreet/ppx_expect")+ (commit (string-append "v" version))))+ (file-name (git-file-name name version))+ (sha256+ (base32+ "0vbbnjrzpyk5p0js21lafr6fcp2wqka89p1876rdf472cmg0l7fv")))) (build-system dune-build-system)- (arguments- `(#:ocaml ,ocaml-4.07- #:findlib ,ocaml4.07-findlib- #:dune ,ocaml4.07-dune)) (propagated-inputs- `(("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" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf))- ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv))- ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here))- ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test))- ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv))- ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv))- ("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")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-ppx-here" ,ocaml-ppx-here)+ ("ocaml-ppx-inline-test" ,ocaml-ppx-inline-test)+ ("ocaml-stdio" ,ocaml-stdio)+ ("ocaml-ppxlib" ,ocaml-ppxlib)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-re" ,ocaml-re)))+ (properties `((upstream-name . "ppx_expect")+ (ocaml4.07-variant . ,(delay ocaml4.07-ppx-expect)))) (home-page "https://github.com/janestreet/ppx_expect") (synopsis "Cram like framework for OCaml") (description "Expect-test is a framework for writing tests in OCaml, similar@@ -5919,6 +5910,30 @@ output-generating code, interleaved with @code{%expect} extension expressions to denote the expected output.") (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 (package (name "ocaml-ppx-js-style")@@ -6091,7 +6106,7 @@ functions from type definitions.") ("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))- ("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-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here))@@ -6236,7 +6251,7 @@ Configurator allows one to: #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (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") (synopsis "Spawning sub-processes") (description-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 39/43] gnu: Add ocaml-variantslib.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-40-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-variantslib): New variable. (ocaml4.07-variantslib): Inherit from ocaml-variantslib.--- gnu/packages/ocaml.scm | 52 ++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 22 deletions(-)
Toggle diff (90 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 4727b294d9..e40bc78db2 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -5137,37 +5137,45 @@ of a record and create new record values.") "12948pzxrl360lybm9fzyvplgcl87zjbn4m3sk1aw75zk85p1388")) (properties `((upstream-name . "fieldslib")))))) -(define-public ocaml4.07-variantslib+(define-public ocaml-variantslib (package- (name "ocaml4.07-variantslib")- (version "0.11.0")- (source (origin- (method url-fetch)- (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v"- (version-major+minor version)- "/files/variantslib-v" version ".tar.gz"))- (sha256- (base32- "1hsdwmkslvk4cznqr4lyyiy7vvk5spil226k0z2in26fxq6y0hf3"))))+ (name "ocaml-variantslib")+ (version "0.14.0")+ (source+ (janestreet-origin "variantslib" version+ "11zp27gh282dx9ifbhcp6i7fkc97fvk8amaj58mf1g1hwklc0lm3")) (build-system dune-build-system) (arguments ;; No 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 . "variantslib")))+ `(("ocaml-base" ,ocaml-base)+ ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree)+ ("ocaml-ppxlib" ,ocaml-ppxlib)))+ (properties `((upstream-name . "variantslib")+ (ocaml4.07-variant . ,(delay ocaml4.07-variantslib)))) (home-page "https://github.com/janestreet/variantslib") (synopsis "OCaml variants as first class values") (description "The Core suite of libraries is an alternative to OCaml's standard library.") (license license:asl2.0))) +(define-public ocaml4.07-variantslib+ (package-with-ocaml4.07+ (package+ (inherit ocaml-variantslib)+ (name "ocaml-variantslib")+ (version "0.11.0")+ (source (origin+ (method url-fetch)+ (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v"+ (version-major+minor version)+ "/files/variantslib-v" version ".tar.gz"))+ (sha256+ (base32+ "1hsdwmkslvk4cznqr4lyyiy7vvk5spil226k0z2in26fxq6y0hf3"))))+ (properties `((upstream-name . "variantslib"))))))+ (define-public ocaml-ppx-fields-conv (package (name "ocaml-ppx-fields-conv")@@ -5268,7 +5276,7 @@ definitions.") (build-system dune-build-system) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))- ("ocaml-variantslib" ,ocaml4.07-variantslib)+ ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib))))@@ -6312,7 +6320,7 @@ standard library that was developed by Jane Street.") ("ocaml-splittable-random" ,ocaml4.07-splittable-random) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) ("ocaml-typerep" ,ocaml4.07-typerep)- ("ocaml-variantslib" ,ocaml4.07-variantslib)+ ("ocaml-variantslib" ,(package-with-ocaml4.07 ocaml-variantslib)) ("ocaml-migrate-parsetree" ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) (properties `((upstream-name . "core_kernel")))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 42/43] gnu: ocaml-num: Update to 1.4.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-43-pukkamustard@posteo.net
* gnu/packages/ocaml.scm (ocaml-num): Update to 1.4.--- gnu/packages/ocaml.scm | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-)
Toggle diff (51 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex c4a024c850..349124c99e 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -958,7 +958,7 @@ written in Objective Caml.") (define-public ocaml-num (package (name "ocaml-num")- (version "1.1")+ (version "1.4") (source (origin (method git-fetch)@@ -967,33 +967,8 @@ written in Objective Caml.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256- (base32 "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0"))))- (build-system ocaml-build-system)- (arguments- `(#:phases- (modify-phases %standard-phases- (delete 'configure)- (add-before 'build 'fix-makefile- (lambda* (#:key outputs #:allow-other-keys)- ;; This package supposes we install to the same directory as- ;; the ocaml package.- (substitute* "src/META"- (("\"\\^\"") (string-append "\"" (assoc-ref outputs "out")- "/lib/ocaml/site-lib\"")))- (substitute* "src/Makefile"- (("\\) \\$\\(STDLIBDIR\\)")- (string-append ") " (assoc-ref outputs "out")- "/lib/ocaml/site-lib")))- #t))- (add-after 'install 'fix-stubslib- (lambda* (#:key outputs #:allow-other-keys)- (format #t "~a~%" (find-files "." ".*.so"))- (let ((stubdir (string-append (assoc-ref outputs "out")- "/lib/ocaml/site-lib/stublibs")))- (delete-file stubdir)- (mkdir-p stubdir)- (install-file "src/dllnums.so" stubdir))- #t)))))+ (base32 "1vzdnvpj5dbj3ifx03v25pj2jj1ccav072v4d29pk1czdba2lzfc"))))+ (build-system dune-build-system) (home-page "https://github.com/ocaml/num") (synopsis "Arbitrary-precision integer and rational arithmetic") (description "OCaml-Num contains the legacy Num library for-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:16 +0200
[PATCH v2 43/43] gnu: Add ocaml-js-of-ocaml.
(address . 47768@debbugs.gnu.org)
20210510051628.15359-44-pukkamustard@posteo.net
From: divoplade <d@divoplade.fr>
* gnu/packages/ocaml.scm (ocaml-js-of-ocaml): New variable.
Co-Authored-By: pukkamustard <pukkamustard@posteo.net>--- gnu/packages/ocaml.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+)
Toggle diff (58 lines)diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scmindex 349124c99e..24d9e814fa 100644--- a/gnu/packages/ocaml.scm+++ b/gnu/packages/ocaml.scm@@ -61,6 +61,7 @@ #:use-module (gnu packages maths) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses)+ #:use-module (gnu packages node) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config)@@ -6939,3 +6940,43 @@ Drawing takes place in a separate window that is created when Graphics.open_graph is called. This library used to be distributed with OCaml up to OCaml 4.08.") (license license:lgpl2.1+)))++(define-public ocaml-js-of-ocaml+ (package+ (name "ocaml-js-of-ocaml")+ (version "3.9.1")+ (source+ (origin+ (method git-fetch)+ (uri (git-reference+ (url "https://github.com/ocsigen/js_of_ocaml")+ (commit version)))+ (file-name (git-file-name name version))+ (sha256+ (base32 "00hdjaj94j3nc6f6wbbpx59h4yc79siphs34i1hry11r56paaqyk"))))+ (build-system dune-build-system)+ (arguments `(#:test-target "."))+ (propagated-inputs+ `(("ocaml-ppxlib" ,ocaml-ppxlib)+ ("ocaml-uchar" ,ocaml-uchar)+ ("ocaml-menhir" ,ocaml-menhir)+ ("ocaml-reactivedata" ,ocaml-reactivedata)+ ("ocaml-cmdliner" ,ocaml-cmdliner)+ ("ocaml-lwt" ,ocaml-lwt)+ ("ocaml-tyxml" ,ocaml-tyxml)+ ("ocaml-re" ,ocaml-re)+ ("ocaml-uutf" ,ocaml-uutf)+ ("ocaml-graphics" ,ocaml-graphics)+ ("ocaml-yojson" ,ocaml-yojson)))+ (native-inputs+ ;; for tests+ `(("node" ,node)+ ("ocaml-ppx-expect" ,ocaml-ppx-expect)+ ("ocaml-num" ,ocaml-num)))+ (properties `((upstream-name . "js_of_ocaml")))+ (home-page "https://ocsigen.org/js_of_ocaml/")+ (synopsis "Compiler from OCaml bytecode to Javascript")+ (description "Js_of_ocaml is a compiler from OCaml bytecode to JavaScript.+It makes it possible to run pure OCaml programs in JavaScript environment like+browsers and Node.js.")+ (license license:lgpl2.1+)))-- 2.31.1
P
P
pukkamustard wrote on 10 May 07:18 +0200
Re: [bug#45558] [PATCH] Add js_of_ocaml
(name . divoplade)(address . d@divoplade.fr)
86fsyvb1a4.fsf@posteo.net
Hi divoplade,
divoplade <d@divoplade.fr> writes:
[...]
Toggle quote (9 lines)> So, now, I should your modified 5 patches in this issue on top > of the> 37 patches in the other issue to get js-of-ocaml. Is it correct?>> At this rate, if it is possible, maybe you could just append > these 5 to> the other issue, it would be easier to track.>> What do you think?
Yeah, that makes sense. I just submitted a V2 of #47768 (https://issues.guix.gnu.org/47768)that includes your patches for js_of_ocaml, merging the issues.
Closing this issue in favor of #47769.
-pukkamustard
?