diff options
author | Benjamin <benjamin@uvy.fr> | 2024-07-14 13:49:52 +0200 |
---|---|---|
committer | Guix Patches Tester <> | 2024-07-14 14:34:41 +0200 |
commit | bc60194daaf162878e1e11cae7f5db1b37944b86 (patch) | |
tree | b1e2d6bc7eccdfa6465aae1fb21c08bf30237a85 | |
parent | e7561b9d3c6c0ecfb96072f007452fb1ea521893 (diff) | |
download | guix-patches-issue-72107.tar guix-patches-issue-72107.tar.gz |
gnu: ocaml-eio: Update to 0.12.issue-72107
* gnu/packages/ocaml.scm (ocaml-eio): Update to 0.12.
[propagated-inputs]: Remove ocaml-lwt, ocaml-logs, and ocaml-odoc; add
ocaml-domain-local-await.
[native-inputs]: Remove ocaml-astring and ocaml-alcotest; add ocaml-odoc.
* gnu/packages/ocaml.scm (ocaml-eio-luv): Remove ocaml-eio-luv.
* gnu/packages/ocaml.scm (ocaml-eio-main): Update to 0.12.
Change-Id: I0445cb1d181deacda827516c9b42104aa77bcad0
-rw-r--r-- | gnu/packages/ocaml.scm | 56 |
1 files changed, 23 insertions, 33 deletions
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0660c3d3d4..01f5d57faf 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3207,7 +3207,7 @@ libraries that need to block in a scheduler friendly manner.") (define ocaml-eio (package (name "ocaml-eio") - (version "0.8.1") + (version "0.12") (home-page "https://github.com/ocaml-multicore/eio") (source (origin @@ -3217,24 +3217,21 @@ libraries that need to block in a scheduler friendly manner.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "02q9i5wbb2497vd4ypc9d9p4zi3lmx0rsv8faiy7h8dnnzbjjf4z")))) + "1havn2h3c0748mj8ic7jn32kswb7sigavnbvxdqf37qn7cx91ilr")))) (build-system dune-build-system) (arguments `(#:package "eio")) (propagated-inputs (list ocaml-bigstringaf ocaml-cstruct - ocaml-lwt + ocaml-domain-local-await ocaml-lwt-dllist - ocaml-logs ocaml-optint ocaml-psq ocaml-fmt ocaml-hmap - ocaml-mtime - ocaml-odoc)) - (native-inputs (list ocaml-astring - ocaml-crowbar - ocaml-alcotest - ocaml-mdx)) + ocaml-mtime)) + (native-inputs (list ocaml-odoc + ocaml-mdx + ocaml-crowbar)) (synopsis "Effect-based direct-style IO API for OCaml") (description "This package provides an effect-based IO API for multicore OCaml with fibers.") @@ -3243,20 +3240,6 @@ OCaml with fibers.") (define-public ocaml5.0-eio (package-with-ocaml5.0 ocaml-eio)) -(define ocaml-eio-luv - (package - (inherit ocaml-eio) - (name "ocaml-eio-luv") - (arguments `(#:package "eio_luv")) - (propagated-inputs (list ocaml-eio ocaml-luv)) - (native-inputs (list ocaml-mdx)) - (synopsis "Libuv-based backend for Ocaml Eio") - (description "@code{Eio_luv} provides a cross-platform backend for -@code{Ocaml Eio}'s APIs using luv (libuv)"))) - -(define-public ocaml5.0-eio-luv - (package-with-ocaml5.0 ocaml-eio-luv)) - (define-public ocaml-unionfind (package (name "ocaml-unionfind") @@ -3320,16 +3303,24 @@ accesses to the store.") (package (inherit ocaml-eio) (name "ocaml-eio-linux") - (arguments `(#:package "eio_linux")) + (arguments `( + #:package "eio_linux" + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-test-path + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "lib_eio_linux/tests/spawn.md" + (("/usr/bin/env") (which "env")))))))) (propagated-inputs - (list ocaml-eio - ocaml-uring + (list ocaml-uring + ocaml-fmt ocaml-logs - ocaml-fmt)) + ocaml-eio)) (native-inputs - (list ocaml-mdx - ocaml-alcotest - ocaml-mdx)) + (list ocaml-odoc + ocaml-cmdliner + ocaml-mdx + ocaml-alcotest)) (synopsis "Linux backend for ocaml-eio") (description "@code{Eio_linux} provides a Linux io-uring backend for @code{Ocaml Eio} APIs, plus a low-level API that can be used directly @@ -3347,10 +3338,9 @@ accesses to the store.") #:tests? #f)) (propagated-inputs (list ocaml-eio - ocaml-eio-luv ocaml-eio-linux)) (native-inputs - (list ocaml-mdx)) + (list ocaml-odoc)) (synopsis "Eio backend selector") (description "@code{Eio_main} selects an appropriate backend (e.g. @samp{eio_linux} or @samp{eio_luv}), depending on your platform."))) |