From patchwork Sun Jul 14 11:49:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin X-Patchwork-Id: 29288 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DAF1C27BBEA; Sun, 14 Jul 2024 12:51:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CF17927BBE2 for ; Sun, 14 Jul 2024 12:51:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSxl2-000389-0E; Sun, 14 Jul 2024 07:51:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sSxl0-00037S-FA for guix-patches@gnu.org; Sun, 14 Jul 2024 07:51:10 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sSxkz-0006Fu-H7 for guix-patches@gnu.org; Sun, 14 Jul 2024 07:51:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSxks-00042A-Si; Sun, 14 Jul 2024 07:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72107] [PATCH 1/5] gnu: ocaml-mdx: Update to 2.4.1. Resent-From: Benjamin Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 14 Jul 2024 11:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72107 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72107@debbugs.gnu.org Cc: Benjamin , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 72107-submit@debbugs.gnu.org id=B72107.172095782215423 (code B ref 72107); Sun, 14 Jul 2024 11:51:02 +0000 Received: (at 72107) by debbugs.gnu.org; 14 Jul 2024 11:50:22 +0000 Received: from localhost ([127.0.0.1]:57230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSxkD-00040a-Ur for submit@debbugs.gnu.org; Sun, 14 Jul 2024 07:50:22 -0400 Received: from mail.uvy.fr ([146.59.197.40]:52372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSxkB-000407-76 for 72107@debbugs.gnu.org; Sun, 14 Jul 2024 07:50:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=uvy.fr; s=202105; t=1720957812; bh=r6hJ+DKxVGiK5VF2+CwyWFRgnxbEl6i8FqJMf8OiSqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oOxa+BboZ5aGRWlzIXueshynqGXuPvO0i3BBiHLyXI9MBOnFR2BSqFtJN5SMSpweI aNW5882iOXOxnctLpwIX5L5+7mEC4NnatkVxKiIcRzTbdR0rwJXIZnsaIFtsSY8FJz 2RAcJYdNNVDz3RFb7v34Lq2LHlSwnNpxLJtt97w66YW/CEi0WYgULsIeCj/+D1k1S9 isnTKw0ZMIMN7XoHqsc005MvRWe55MRbeUvx/iR+VfSaScHPU2BYQbXHzt1pS3mQ0m 8dBOmpoBbql+QDpA84CVwkPl+OiqzGA4DqVPmWpEfRj8MqrX4NXSct2yffvWcIacYc eGiqTaFcFsJUQ== Date: Sun, 14 Jul 2024 13:49:48 +0200 Message-ID: <4b223400cd4730c925ade5f6796757230176c0cc.1720956786.git.benjamin@uvy.fr> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Benjamin X-ACL-Warn: , Benjamin via Guix-patches X-Patchwork-Original-From: Benjamin via Guix-patches via From: Benjamin Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-mdx): Update to 2.4.1. [propagated-inputs]: Remove ocaml-odoc and ocaml-odoc-parser; add ocaml-camlp-streams, ocaml-csexp, and ocaml-cppo. [native-inputs]: Remove ocaml-cppo; add ocaml-odoc. Change-Id: I319fc32d958efe0ca5db6d6c4fef9dbf0de97fd1 --- gnu/packages/ocaml.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1204c78883..fa84ea73a5 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8445,7 +8445,7 @@ (define-public ocaml-version (define-public ocaml-mdx (package (name "ocaml-mdx") - (version "2.1.0") + (version "2.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -8454,7 +8454,7 @@ (define-public ocaml-mdx (file-name (git-file-name name version)) (sha256 (base32 - "1w1givvhwv9jzj9zbg4mmlpb35sqi75w83r99p2z50bdr69fdf57")))) + "14v4iv0xypvl60y9vsg5rs8xbwxagmz0zr8sxrzchd6xij0nlplv")))) (build-system dune-build-system) (arguments `(#:phases @@ -8473,17 +8473,18 @@ (define-public ocaml-mdx (substitute* "test/bin/mdx-test/expect/padding/test-case.md" (("egrep") "grep -E"))))))) (propagated-inputs - (list ocaml-fmt - ocaml-astring - ocaml-logs - ocaml-cmdliner + (list ocaml-result + ocaml-camlp-streams + ocaml-version ocaml-re - ocaml-result - ocaml-odoc - ocaml-odoc-parser - ocaml-version)) + ocaml-cmdliner + ocaml-logs + ocaml-astring + ocaml-csexp + ocaml-cppo + ocaml-fmt)) (native-inputs - (list ocaml-cppo ocaml-lwt ocaml-alcotest)) + (list ocaml-odoc ocaml-alcotest ocaml-lwt)) (home-page "https://github.com/realworldocaml/mdx") (synopsis From patchwork Sun Jul 14 11:49:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin X-Patchwork-Id: 29286 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EE3CF27BBEA; Sun, 14 Jul 2024 12:51:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7EE8D27BBE2 for ; Sun, 14 Jul 2024 12:51:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSxkv-00035h-2i; Sun, 14 Jul 2024 07:51:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sSxks-00034n-QS for guix-patches@gnu.org; Sun, 14 Jul 2024 07:51:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sSxks-0006Ey-IC for guix-patches@gnu.org; Sun, 14 Jul 2024 07:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSxkt-00042P-Rs; Sun, 14 Jul 2024 07:51:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72107] [PATCH 2/5] gnu: Add ocaml-thread-table. Resent-From: Benjamin Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 14 Jul 2024 11:51:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72107 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72107@debbugs.gnu.org Cc: Benjamin , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 72107-submit@debbugs.gnu.org id=B72107.172095785115476 (code B ref 72107); Sun, 14 Jul 2024 11:51:03 +0000 Received: (at 72107) by debbugs.gnu.org; 14 Jul 2024 11:50:51 +0000 Received: from localhost ([127.0.0.1]:57236 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSxkg-00041T-Vh for submit@debbugs.gnu.org; Sun, 14 Jul 2024 07:50:51 -0400 Received: from mail.uvy.fr ([146.59.197.40]:41594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSxkf-00041G-HE for 72107@debbugs.gnu.org; Sun, 14 Jul 2024 07:50:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=uvy.fr; s=202105; t=1720957812; bh=saM3ugpTpHDhRv1is0lMK2YgDSkPayozbasn58uWPM4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tWubCmmoc4QT6dhJp2fv1oXWy2VqxwzT+gJ7nmBFxi0fAxR9oR7cEBgtfSFj4C7dZ Neii2pzYNw7KifwE0v8rgXTeSQM0uAXLZ4R9xNKnfqEwy7528qmJ4CVpOrp9ae5sph dFHyLPyqKqRrsRw3kURaCRXteQ+nyenpaOxf9r70tbsuhYizdZ0mEzHOPUVo/O82ZS 89WIDpbTsWVPpdo9mERu83Hk5p1/vLSl0OEcOFA0tgxRWMuAbj+t3tfgwyQDqgKsYw Pq+PevTYIC/vJWk3UdsG/kaGt2ZeI1MkRvJlRBr/C/2bWFYZ8ejQ5dtRLm182t8Bz0 k3ZXr64Y5a91Q== Date: Sun, 14 Jul 2024 13:49:49 +0200 Message-ID: <62b3c0488e059e026271c2ef4c88fa8aa3e5d00f.1720956786.git.benjamin@uvy.fr> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Benjamin X-ACL-Warn: , Benjamin via Guix-patches X-Patchwork-Original-From: Benjamin via Guix-patches via From: Benjamin Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-thread-table): New variable. Change-Id: If0175f44e6959befc539a399bd8bdebdcb41ba1b --- gnu/packages/ocaml.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fa84ea73a5..a6fb5af138 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3133,6 +3133,29 @@ (define-public ocaml-hmap to which allows adding and looking up bindings in a type safe manner.") (license license:isc))) +(define-public ocaml-thread-table + (package + (name "ocaml-thread-table") + (version "1.0.0") + (home-page "https://github.com/ocaml-multicore/thread-table") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 (base32 + "05sla96m4lbfrnrjczj4xl1zbcwypir6krp4y16x50hz24ai12pc")))) + (build-system dune-build-system) + (arguments `(#:package "thread-table")) + (native-inputs (list ocaml-odoc ocaml-alcotest)) + (synopsis "A lock-free thread-safe integer keyed hash table") + (description "Ocaml library implementing a minimalist lock-free thread-safe +integer keyed hash table with zero synchronization overhead on lookups designed +for associating thread specific state with threads within a domain.") + (license license:isc))) + (define ocaml-eio (package (name "ocaml-eio") From patchwork Sun Jul 14 11:49:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin X-Patchwork-Id: 29285 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1EED127BBEA; Sun, 14 Jul 2024 12:51:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8EE9127BBE2 for ; Sun, 14 Jul 2024 12:51:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSxkw-000368-Bv; Sun, 14 Jul 2024 07:51:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sSxkt-00035C-TZ for guix-patches@gnu.org; Sun, 14 Jul 2024 07:51:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sSxkt-0006FC-EY for guix-patches@gnu.org; Sun, 14 Jul 2024 07:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSxks-000424-E0; Sun, 14 Jul 2024 07:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72107] [PATCH 3/5] gnu: Add ocaml-domain-schims. Resent-From: Benjamin Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 14 Jul 2024 11:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72107 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72107@debbugs.gnu.org Cc: Benjamin , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 72107-submit@debbugs.gnu.org id=B72107.172095782215415 (code B ref 72107); Sun, 14 Jul 2024 11:51:02 +0000 Received: (at 72107) by debbugs.gnu.org; 14 Jul 2024 11:50:22 +0000 Received: from localhost ([127.0.0.1]:57228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSxkD-00040X-Jk for submit@debbugs.gnu.org; Sun, 14 Jul 2024 07:50:21 -0400 Received: from mail.uvy.fr ([146.59.197.40]:52382) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSxkB-000408-R9 for 72107@debbugs.gnu.org; Sun, 14 Jul 2024 07:50:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=uvy.fr; s=202105; t=1720957813; bh=UmBoCO3n0R5RQHFpCRh5ezhXKdmlv2ECee46O/iFA7E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WzeE6MfwpT4O/MHgKLMWQCWoR2K2UPKsVDGIKUNsDf0yhjW0S283QzbdnFD9Eq9sF wE4mkBI37Dv1FKVOBZbZMz736IeOUXwIoOn2Qq2hQEe4NR0K1HhPeNpGrp0PJe11vx +hYOjwAloTQbqjgooxFsa59pr1dopRfV5lErjuks6ienvNvYdOQNwBUB4CSJeXPk3i G18yJC8BxuAFkYDGG4Z7+sRi/MF4sqAv+eIlvvXJufndVvVQPgFkNfynVyHmNKfZKi XtJCY3qR1TfAg5j6OHBnQ4aFQKn2MhFOH4XQmM1Nm73TNV3XMqn7EX22+P4E7Yi5Ex VObTcH/QkqPpQ== Date: Sun, 14 Jul 2024 13:49:50 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Benjamin X-ACL-Warn: , Benjamin via Guix-patches X-Patchwork-Original-From: Benjamin via Guix-patches via From: Benjamin Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-domain-schims): New variable. Change-Id: Ifbf8ade84658862a187f165a1bf7abe17ee1ecb7 --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a6fb5af138..fdeec8f2a1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3156,6 +3156,30 @@ (define-public ocaml-thread-table for associating thread specific state with threads within a domain.") (license license:isc))) +(define-public ocaml-domain-schims + (package + (name "ocaml-domain-schims") + (version "0.1.0") + (home-page "https://gitlab.com/gasche/domain-shims") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 (base32 + "0mxvzhxgcrvv0l99i4blag52v7g1knycwsh1xv9vkmh0rpwb147z")))) + (build-system dune-build-system) + (arguments `(#:package "domain_shims")) + (native-inputs (list)) + (synopsis "A self-contained implementation of the Domain module for OCaml 4.") + (description "Domain is a new module of the OCaml 5 standard library that exposes +the Multicore OCaml runtime's ability to run OCaml computations in parallel. +With domain-shims, you can compile run code that was written for +OCaml 5 using the Domain module under OCaml 4") + (license license:expat))) + (define ocaml-eio (package (name "ocaml-eio") From patchwork Sun Jul 14 11:49:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin X-Patchwork-Id: 29287 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CAD6327BBE9; Sun, 14 Jul 2024 12:51:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 377BC27BBE2 for ; Sun, 14 Jul 2024 12:51:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSxku-00035e-P0; Sun, 14 Jul 2024 07:51:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sSxks-00034m-Mg for guix-patches@gnu.org; Sun, 14 Jul 2024 07:51:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sSxks-0006Ew-E1 for guix-patches@gnu.org; Sun, 14 Jul 2024 07:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSxkt-00042H-EP; Sun, 14 Jul 2024 07:51:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72107] [PATCH 4/5] gnu: Add ocaml-domain-local-await. Resent-From: Benjamin Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 14 Jul 2024 11:51:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72107 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72107@debbugs.gnu.org Cc: Benjamin , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 72107-submit@debbugs.gnu.org id=B72107.172095782315430 (code B ref 72107); Sun, 14 Jul 2024 11:51:03 +0000 Received: (at 72107) by debbugs.gnu.org; 14 Jul 2024 11:50:23 +0000 Received: from localhost ([127.0.0.1]:57232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSxkE-00040i-Bs for submit@debbugs.gnu.org; Sun, 14 Jul 2024 07:50:22 -0400 Received: from mail.uvy.fr ([146.59.197.40]:52386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSxkC-000409-55 for 72107@debbugs.gnu.org; Sun, 14 Jul 2024 07:50:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=uvy.fr; s=202105; t=1720957813; bh=32LUSHrE5twu+Msp63Yzej06F6X0mhGFeHzdRWuWcW8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nbgpLzeJzeXM/6up+l9Gt8HHruFIL0hHXOxmMm7FpJfARFbhnFSPUY1AImv3Rc1mZ zcH135EIhDAvNvVxxwyjcxvTibImTcL4+VWrqvanlNOt/BZMH1KkE2A4YVcxzUNb1F 2/U41cRgaweBPFxWUVT30qVTnzWA/Exv3zlQDj1zYw1QxH8CZO+7AA5s/iiPRUNDaS DWF1a+7RR3u0Cz0MCBSmzokZ6qT2DIg3xkWPkeOAC417FBak3O39nF0lGm6O1u0mxO ra45x3aXauA0+LQmtdu3BVlCoKTt6FYkjHHDlxb9byUovDfS25QeMDzXfUw0IgSTd4 Ap5nvDj6c/Vlg== Date: Sun, 14 Jul 2024 13:49:51 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Benjamin X-ACL-Warn: , Benjamin via Guix-patches X-Patchwork-Original-From: Benjamin via Guix-patches via From: Benjamin Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-domain-local-await): New variable. Change-Id: I8ae010390f4aacfaa4c82f4ec18cbf5480595120 --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fdeec8f2a1..0660c3d3d4 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3180,6 +3180,30 @@ (define-public ocaml-domain-schims OCaml 5 using the Domain module under OCaml 4") (license license:expat))) +(define-public ocaml-domain-local-await + (package + (name "ocaml-domain-local-await") + (version "1.0.1") + (home-page "https://github.com/ocaml-multicore/domain-local-await") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 (base32 + "0h60sxzd9p14ilpg004d47y3zd89pswffr0wvqa9cykpn8qgdfcm")))) + (build-system dune-build-system) + (arguments `(#:package "domain-local-await")) + (propagated-inputs (list ocaml-thread-table)) + (native-inputs (list ocaml-odoc ocaml-domain-schims ocaml-version ocaml-mdx ocaml-alcotest)) + (synopsis "A scheduler independent blocking mechanism") + (description "Ocaml library implementing a scheduler independent blocking +mechanism. It provides a low level mechanism intended for writing higher level +libraries that need to block in a scheduler friendly manner.") + (license license:isc))) + (define ocaml-eio (package (name "ocaml-eio") From patchwork Sun Jul 14 11:49:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin X-Patchwork-Id: 29284 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4C82927BBEA; Sun, 14 Jul 2024 12:51:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4AB8627BBE2 for ; Sun, 14 Jul 2024 12:51:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sSxky-00036d-0n; Sun, 14 Jul 2024 07:51:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sSxkv-00035m-Or for guix-patches@gnu.org; Sun, 14 Jul 2024 07:51:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sSxkv-0006Fd-G1 for guix-patches@gnu.org; Sun, 14 Jul 2024 07:51:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sSxku-00042a-Av; Sun, 14 Jul 2024 07:51:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72107] [PATCH 5/5] gnu: ocaml-eio: Update to 0.12. Resent-From: Benjamin Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 14 Jul 2024 11:51:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72107 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72107@debbugs.gnu.org Cc: Benjamin , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 72107-submit@debbugs.gnu.org id=B72107.172095785515488 (code B ref 72107); Sun, 14 Jul 2024 11:51:04 +0000 Received: (at 72107) by debbugs.gnu.org; 14 Jul 2024 11:50:55 +0000 Received: from localhost ([127.0.0.1]:57238 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSxkk-00041i-9U for submit@debbugs.gnu.org; Sun, 14 Jul 2024 07:50:55 -0400 Received: from mail.uvy.fr ([146.59.197.40]:41604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sSxkg-00041I-GF for 72107@debbugs.gnu.org; Sun, 14 Jul 2024 07:50:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=uvy.fr; s=202105; t=1720957813; bh=6d0E6Qm9c1eEtbQEKgWiPJOB8nnbo217eQz5nUwLiR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wozuxOA13MuDgBWlzpeoefnR3PMxzbIWClZUBC5glHBbebvKjeODA9wEj3rTCQfkU MAm8MAQzUu3bNzEUuS/sZDnJhR6H+8+M7b9Yi56ptOHz8QZk4zPXnSHv78Z6MNovK/ /qruViQslUgazlRGnBl2xpabyqOf/TbxPWrJiXVi9fl73yEp1qLnYOHfdIOwm+8TA9 HvNW7t7fHG2XoesQs/7JppEnBMH4+o5dTB+ehM5Scab++0idJEkiw2hm79bX8/bfff njw+BP3bfq8L/4/5bmvAGWXyXdkGADFyVABqEGSXRoK7+X1fTnyun+TUXo3SJgXCEm +HN/VO/1hvS7g== Date: Sun, 14 Jul 2024 13:49:52 +0200 Message-ID: <02f027b2684ce91e2e980e5083609e44d4f366de.1720956786.git.benjamin@uvy.fr> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Benjamin X-ACL-Warn: , Benjamin via Guix-patches X-Patchwork-Original-From: Benjamin via Guix-patches via From: Benjamin Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 --- gnu/packages/ocaml.scm | 56 +++++++++++++++++------------------------- 1 file 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 @@ (define-public ocaml-domain-local-await (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 @@ (define ocaml-eio (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 @@ (define ocaml-eio (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 @@ (define ocaml-eio-linux (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 @@ (define ocaml-eio-main #: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.")))