From patchwork Fri Dec 16 13:25:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45357 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 E20E927BBEB; Fri, 16 Dec 2022 13:27:08 +0000 (GMT) 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 2998F27BBE9 for ; Fri, 16 Dec 2022 13:27:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aiz-0005kD-1b; Fri, 16 Dec 2022 08:26:05 -0500 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 1p6Aiw-0005iT-Rl for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aiw-000784-Ch for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aiw-00033L-7r for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 01/28] gnu: Add ocaml-5.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119714011547 (code B ref 60120); Fri, 16 Dec 2022 13:26:02 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:25:40 +0000 Received: from localhost ([127.0.0.1]:49255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aia-00030B-BW for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:40 -0500 Received: from mout02.posteo.de ([185.67.36.66]:56895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6AiY-0002zz-Bp for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:39 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 49B33240104 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197132; bh=JE7pmf//4dSar+IiNFkbuvDwYqVfCGC2Xzfl9h0Wt4s=; h=From:To:Cc:Subject:Date:From; b=kxNzsKbpuWwNHbztbfpW6/rSYlx8h0bJzoPqhrAbem1tGgGtAXPBySmkWgIP4vkHo PmcErPP5zjnev25jJdmtvDvqtS57F0WaUY/+4tGZ3yRTJT3RD7ivbq/d4sxbUrfzVL k7e6PuqQaDvSyR8bQWRH5qtjw9WwXY5mqL3XbtiBHOijDwMiAxBz6eZoYgivvZlXkb i/uieG91FHEFlAQcwrfgn77Uhj96bPWIwluzSRcUcen8oT77p1lTzlpvN+saf0q0Ii wi1+GVsAwiOz95kLpdd3zHIwEBOe4oH87Sp4cmgRZEykBqFzN16O0RLZhsseTfhpsu MCz9tLn7BypuQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGM53vjz6tm4; Fri, 16 Dec 2022 14:25:31 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:00 +0000 Message-Id: <20221216132527.2539-1-pukkamustard@posteo.net> In-Reply-To: <20221216132224.2229-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> 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: , 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-5.0): New variable. --- gnu/packages/ocaml.scm | 60 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e0bedf74f9..ae8b0c8ee1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -185,6 +185,66 @@ (define-public camlboot This package produces a native @command{ocamlc} and a bytecode @command{ocamllex}.") (license license:expat)))) +(define-public ocaml-5.0 + (package + (name "ocaml") + (version "5.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/ocaml") + (commit version))) + (sha256 + (base32 + "1p0p8wldrnbr61wfy3x4122017g4k5gjvfwlg3mvlqn8r2fxn2m5")))) + (build-system gnu-build-system) + (native-search-paths + (list (search-path-specification + (variable "OCAMLPATH") + (files (list "lib/ocaml" "lib/ocaml/site-lib"))) + (search-path-specification + (variable "CAML_LD_LIBRARY_PATH") + (files (list "lib/ocaml/site-lib/stubslibs" + "lib/ocaml/site-lib/stublibs"))))) + (native-inputs + (list perl pkg-config)) + (inputs + (list libx11 libiberty ;needed for objdump support + zlib)) ;also needed for objdump support + (arguments + `(#:configure-flags '("--enable-ocamltest") + #:test-target "tests" + #:make-flags '("world.opt") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/sh-references + (lambda* (#:key inputs #:allow-other-keys) + (let* ((sh (search-input-file inputs "/bin/sh")) + (quoted-sh (string-append "\"" sh "\""))) + (with-fluids ((%default-port-encoding #f)) + (for-each + (lambda (file) + (substitute* file + (("\"/bin/sh\"") + (begin + (format (current-error-port) "\ +patch-/bin/sh-references: ~a: changing `\"/bin/sh\"' to `~a'~%" + file quoted-sh) + quoted-sh)))) + (find-files "." "\\.ml$"))))))))) + (home-page "https://ocaml.org/") + (synopsis "The OCaml programming language") + (description + "OCaml is a general purpose industrial-strength programming language with +an emphasis on expressiveness and safety. Developed for more than 20 years at +Inria it benefits from one of the most advanced type systems and supports +functional, imperative and object-oriented styles of programming.") + ;; The compiler is distributed under qpl1.0 with a change to choice of + ;; law: the license is governed by the laws of France. The library is + ;; distributed under lgpl2.0. + (license (list license:qpl license:lgpl2.0)))) + + (define-public ocaml-4.14 (package (name "ocaml") From patchwork Fri Dec 16 13:25:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45362 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 956F427BBED; Fri, 16 Dec 2022 13:27:21 +0000 (GMT) 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 2C83E27BBE9 for ; Fri, 16 Dec 2022 13:27:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aiz-0005kw-CH; Fri, 16 Dec 2022 08:26:05 -0500 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 1p6Aix-0005j1-Dy for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aix-00078H-5o for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aiw-00033b-Se for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 02/28] gnu: ocaml-findlib: Update to 1.9.5. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119714511568 (code B ref 60120); Fri, 16 Dec 2022 13:26:02 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:25:45 +0000 Received: from localhost ([127.0.0.1]:49259 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aie-00030Q-Oo for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:45 -0500 Received: from mout02.posteo.de ([185.67.36.66]:50407) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aid-000303-1u for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:43 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 8C73E240104 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197137; bh=v3/JQLmCV6S7aHTovwLs08MaCOHwF3EpyslJ2OBTPxc=; h=From:To:Cc:Subject:Date:From; b=fQV/j9V1EBhlwpJVT0e6KnJWeFcI52jX1a7DdpYUPCEBn9nJlZiS283YA25q6/KzW IyIQI+ITGpoQxblbLqBnEZ2XesU3j08YSTu/VPQ4MdB6kpXbJPPJD7+T7N2qdCs0Vp my78os9io4kJ0r3WkeJfBdfFUN64h1dVwzjRYvv40mLGZXQMOezcrmQbN3nCp634AZ 1bFw9BlMdMZC/oRp9HuK/9XX0jXk3HUDRiuV21Q15JGmAHZ5uDRF2Lkab4HKtfsQz2 x1v2UV9VBzJdUTDekCQ1Zjmcn8J729GRDpj7OQJKja5sgfyJjwZptcJlJ5ArugVuLJ TKuEmof2ZW5Kw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGT0GGvz6tmS; Fri, 16 Dec 2022 14:25:36 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:01 +0000 Message-Id: <20221216132527.2539-2-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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-findlib): Update to 1.9.5. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ae8b0c8ee1..699dbca8f1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1403,14 +1403,14 @@ (define-public unison (define-public ocaml-findlib (package (name "ocaml-findlib") - (version "1.9.3") + (version "1.9.5") (source (origin (method url-fetch) (uri (string-append "http://download.camlcity.org/download/" "findlib" "-" version ".tar.gz")) (sha256 (base32 - "0hfcwamcvinmww59b5i4yxbf0kxyzkp5qv3d1c7ybn9q52vgq463")))) + "0w9578j1561f5gi51sn2jgxm3kh3sn88cpannhdkqcdg1kk08iqd")))) (build-system gnu-build-system) (native-inputs (list m4 ocaml)) From patchwork Fri Dec 16 13:25:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45368 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 3C8E127BBEE; Fri, 16 Dec 2022 13:27:41 +0000 (GMT) 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 F3E1127BBE9 for ; Fri, 16 Dec 2022 13:27:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj0-0005ln-AI; Fri, 16 Dec 2022 08:26:06 -0500 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 1p6Aix-0005jU-U8 for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aix-00078V-Lv for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aix-00033o-GD for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 03/28] gnu: Add ocaml5.0-findlib Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119714811595 (code B ref 60120); Fri, 16 Dec 2022 13:26:03 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:25:48 +0000 Received: from localhost ([127.0.0.1]:49264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aii-00030w-Be for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:48 -0500 Received: from mout02.posteo.de ([185.67.36.66]:33719) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aie-000309-Er for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:44 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id EC099240101 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197139; bh=xdB+eLHid8W/K36ZpQaN+rKXBw96O9msrED2BTet3C0=; h=From:To:Cc:Subject:Date:From; b=KgdqeOy75cbEOgUEAMgRrwDL770p3WDMMCIw4JVN4pZzLZ6YH6l452y/ZKU+wFrr7 vPmoiF1LQ5Kogy7YoI86XsnFPq4MIYdscTC3sj0Hcsxv+n9z1Zkz1tSBSBfXdAT04b IwiuakdDWBejwp4ZlzuWx1MlwuL8geJGfxqwHwKOru3HJplCUrUolbd5yTTGgz/9sj 1oI+YyBsgSvyYltcnxSXb5ybwKHHIplB9yCgbK2JuwQNHn73RAu00s7EM+KazfNEyq pa63jXWllo9DEnakLcGEKYhroN2ZDvkl9DhBI7Mn9CZV5RATN6TJsIzI7ho4NSE652 2/oTFzfL4BM0A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGV3LtFz6tn5; Fri, 16 Dec 2022 14:25:38 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:02 +0000 Message-Id: <20221216132527.2539-3-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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 (ocaml5.0-findlib): New variable. --- gnu/packages/ocaml.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 699dbca8f1..e8f64915d9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1465,6 +1465,13 @@ (define-public ocaml4.09-findlib (native-inputs (list m4 ocaml-4.09)))) +(define-public ocaml5.0-findlib + (package + (inherit ocaml-findlib) + (name "ocaml5.0-findlib") + (native-inputs + (list m4 ocaml-5.0)))) + (define-public ocaml-ounit2 (package (name "ocaml-ounit2") From patchwork Fri Dec 16 13:25:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45355 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 ABA0E27BBEB; Fri, 16 Dec 2022 13:27:03 +0000 (GMT) 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 5C8BE27BBE9 for ; Fri, 16 Dec 2022 13:27:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj0-0005mb-Ic; Fri, 16 Dec 2022 08:26:06 -0500 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 1p6Aiz-0005kL-3F for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aiy-00078f-4g for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aix-000340-VU for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 04/28] guix: ocaml: Add package-with-ocaml5.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119714911602 (code B ref 60120); Fri, 16 Dec 2022 13:26:03 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:25:49 +0000 Received: from localhost ([127.0.0.1]:49266 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aii-000313-Ox for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:49 -0500 Received: from mout02.posteo.de ([185.67.36.66]:34775) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aif-00030A-F7 for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:46 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id EFEAE240104 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197140; bh=8ghdtStnUTA0RfbRevqJzCuyge0QcVg6IJhP6cCQ/cA=; h=From:To:Cc:Subject:Date:From; b=NjADmQ+6niLqlG2aitbjSrmbcBg1m3b0pAk2IrLPLjumihboP8M0lK8tWmFhpjiFS vrb7aruUNaM8U+08jnDz44CEw1+HPq+48OLei2MaEJxFUbxUKdTrzNgES6VGG06RhV 3W1ycAGOjTi81TxgsY9VCweh/btl1xt2YPGkQLYHqjd6e6OBUKhYJru3V7jN4m3OqR uWJham6AvEnV0ceComLrA+o1X+MBon7ytPSQcpwbN6eScW3oBlfxnRYeaUfDEisrvZ 1qBBb97YF+fW2UJSDDBu3qDBqFf0qVpg5cyNmRuA4h0LXbhMUpqbJANSW9DZd6kdYC Ir1mAYL6B/8ig== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGW32tpz6tmq; Fri, 16 Dec 2022 14:25:39 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:03 +0000 Message-Id: <20221216132527.2539-4-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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 * guix/build-system/ocaml.scm (package-with-ocaml5.0) (strip-ocaml5.0-variant): New variables. * gnu/packages/ocaml.scm (ocaml5.0-dune-bootstrap) (ocaml5.0-dune, ocaml5.0-dune-configurator) (ocaml5.0-csexp, ocaml5.0-result): New variables. --- gnu/packages/ocaml.scm | 51 ++++++++++++++++++++++++++++++++++--- guix/build-system/ocaml.scm | 27 ++++++++++++++++++++ 2 files changed, 75 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index e8f64915d9..605baa801d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1819,6 +1819,9 @@ (define dune-bootstrap (define ocaml4.09-dune-bootstrap (package-with-ocaml4.09 dune-bootstrap)) +(define ocaml5.0-dune-bootstrap + (package-with-ocaml5.0 dune-bootstrap)) + (define-public dune-configurator (package (inherit dune-bootstrap) @@ -1839,7 +1842,8 @@ (define-public dune-configurator (delete-file-recursively "vendor/pp")))))) (propagated-inputs (list ocaml-csexp)) - (properties `((ocaml4.09-variant . ,(delay ocaml4.09-dune-configurator)))) + (properties `((ocaml4.09-variant . ,(delay ocaml4.09-dune-configurator)) + (ocaml5.0-variant . ,(delay ocaml5.0-dune-configurator)))) (synopsis "Dune helper library for gathering system configuration") (description "Dune-configurator is a small library that helps writing OCaml scripts that test features available on the system, in order to generate @@ -1864,13 +1868,25 @@ (define-public ocaml4.09-dune-configurator (propagated-inputs `(("ocaml-csexp" ,ocaml4.09-csexp))))) +(define-public ocaml5.0-dune-configurator + (package + (inherit dune-configurator) + (name "ocaml5.0-dune-configurator") + (arguments + `(,@(package-arguments dune-configurator) + #:dune ,ocaml5.0-dune-bootstrap + #:ocaml ,ocaml-5.0 + #:findlib ,ocaml5.0-findlib)) + (propagated-inputs (list ocaml5.0-csexp)))) + (define-public dune (package (inherit dune-bootstrap) (propagated-inputs (list dune-configurator)) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-dune)) - (ocaml4.09-variant . ,(delay ocaml4.09-dune)))))) + (ocaml4.09-variant . ,(delay ocaml4.09-dune)) + (ocaml5.0-variant . ,(delay ocaml5.0-dune)))))) (define-public ocaml4.09-dune (package @@ -1892,6 +1908,12 @@ (define-public ocaml4.07-dune (base32 "0l4x0x2fz135pljv88zj8y6w1ninsqw0gn1mdxzprd6wbxbyn8wr")))))) +(define-public ocaml5.0-dune + (package + (inherit ocaml5.0-dune-bootstrap) + (propagated-inputs + (list ocaml5.0-dune-configurator)))) + (define-public ocaml-csexp (package (name "ocaml-csexp") @@ -1946,6 +1968,18 @@ (define-public ocaml4.09-csexp (propagated-inputs `(("ocaml-result" ,ocaml4.09-result))))) +(define-public ocaml5.0-csexp + (package + (inherit ocaml-csexp) + (name "ocaml5.0-csexp") + (arguments + `(#:ocaml ,ocaml-5.0 + #:findlib ,ocaml5.0-findlib + ,@(substitute-keyword-arguments (package-arguments ocaml-csexp) + ((#:dune _) ocaml5.0-dune-bootstrap)))) + (propagated-inputs + `(("ocaml-result" ,ocaml5.0-result))))) + (define-public ocaml-migrate-parsetree (package (name "ocaml-migrate-parsetree") @@ -2131,7 +2165,8 @@ (define-public ocaml-result (arguments `(#:test-target "." #:dune ,dune-bootstrap)) - (properties `((ocaml4.09-variant . ,(delay ocaml4.09-result)))) + (properties `((ocaml4.09-variant . ,(delay ocaml4.09-result)) + (ocaml5.0-variant . ,(delay ocaml5.0-result)))) (home-page "https://github.com/janestreet/result") (synopsis "Compatibility Result module") (description "Uses the new result type defined in OCaml >= 4.03 while @@ -2148,6 +2183,16 @@ (define-public ocaml4.09-result #:dune ,ocaml4.09-dune-bootstrap #:ocaml ,ocaml-4.09 #:findlib ,ocaml4.09-findlib)))) + +(define-public ocaml5.0-result + (package + (inherit ocaml-result) + (name "ocaml5.0-result") + (arguments + `(#:test-target "." + #:dune ,ocaml5.0-dune-bootstrap + #:ocaml ,ocaml-5.0 + #:findlib ,ocaml5.0-findlib)))) (define-public ocaml-topkg (package diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm index 5ced9d243b..b08985cd4d 100644 --- a/guix/build-system/ocaml.scm +++ b/guix/build-system/ocaml.scm @@ -32,6 +32,8 @@ (define-module (guix build-system ocaml) strip-ocaml4.07-variant package-with-ocaml4.09 strip-ocaml4.09-variant + package-with-ocaml5.0 + strip-ocaml5.0-variant default-findlib default-ocaml lower @@ -111,6 +113,18 @@ (define (default-ocaml4.09-dune) (let ((module (resolve-interface '(gnu packages ocaml)))) (module-ref module 'ocaml4.09-dune))) +(define (default-ocaml5.0) + (let ((ocaml (resolve-interface '(gnu packages ocaml)))) + (module-ref ocaml 'ocaml-5.0))) + +(define (default-ocaml5.0-findlib) + (let ((module (resolve-interface '(gnu packages ocaml)))) + (module-ref module 'ocaml5.0-findlib))) + +(define (default-ocaml5.0-dune) + (let ((module (resolve-interface '(gnu packages ocaml)))) + (module-ref module 'ocaml5.0-dune))) + (define* (package-with-explicit-ocaml ocaml findlib dune old-prefix new-prefix #:key variant-property) "Return a procedure of one argument, P. The procedure creates a package @@ -199,6 +213,19 @@ (define (strip-ocaml4.09-variant p) (inherit p) (properties (alist-delete 'ocaml4.09-variant (package-properties p))))) +(define package-with-ocaml5.0 + (package-with-explicit-ocaml (delay (default-ocaml5.0)) + (delay (default-ocaml5.0-findlib)) + (delay (default-ocaml5.0-dune)) + "ocaml-" "ocaml5.0-" + #:variant-property 'ocaml5.0-variant)) + +(define (strip-ocaml5.0-variant p) + "Remove the 'ocaml5.0-variant' property from P." + (package + (inherit p) + (properties (alist-delete 'ocaml5.0-variant (package-properties p))))) + (define* (lower name #:key source inputs native-inputs outputs system target (ocaml (default-ocaml)) From patchwork Fri Dec 16 13:25:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45356 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 4508927BBED; Fri, 16 Dec 2022 13:27:07 +0000 (GMT) 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 AE18A27BBE9 for ; Fri, 16 Dec 2022 13:27:06 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj0-0005mj-NM; Fri, 16 Dec 2022 08:26:06 -0500 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 1p6Aiz-0005kK-3X for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aiy-00078m-QD for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aiy-00034D-Jc for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 05/28] gnu: opam: Use OCaml 4.14 compiled version when building OCaml 5.0 packages. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119714911610 (code B ref 60120); Fri, 16 Dec 2022 13:26:04 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:25:49 +0000 Received: from localhost ([127.0.0.1]:49268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aij-00031A-CJ for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:49 -0500 Received: from mout01.posteo.de ([185.67.36.65]:44443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aig-00030I-Rj for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:47 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2A900240029 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197141; bh=3TSffpsmWxDDZ7O82Cs0DUB0TM4TPaPgdIxlWPGD0d0=; h=From:To:Cc:Subject:Date:From; b=c1rHvf3J+wZzbiDBQUcCAJ4rur+njtP6dqsjDWetzRzHyZD3DodleFdCEUlimmYa4 h1FmkCBSAKylMBPPYZ4Dkm5/+gR7zR+UKWcNoJy+0gRYaQFi0QMwdGjLRFwNyViqeW eAIyxQIZMJXGPoWxxxCynbj/zd2pEM/Mv6Q/34VPhsX1XrJvA6tK7UQHt9gLbrFGBB uaaOZbzvcoIr22piDTn/7I8ugvnqRdblrPyBmUExucJ244X0x990qZEYJce7DD+tlv jKqBUvybGowWxJhkAndmzFAroxSN15ftqAJwZk5bHhuwKJeKVm9d7FP94nRh31N98B 3bDvvpqHzPWQg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGX42Pnz6tmS; Fri, 16 Dec 2022 14:25:40 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:04 +0000 Message-Id: <20221216132527.2539-5-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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 (opam)[properties]: Add ocaml5.0-variant. (opam)[propagated-inputs]: Move to inputs. --- gnu/packages/ocaml.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 605baa801d..7abb31d183 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -960,11 +960,12 @@ (define-public opam "0j9abisx3ifzm66ci3p45mngmz4f0fx7yd9jjxrz3f8w5jffc9ii")) ("opam-repo-f372039d" ,(opam-repo "f372039db86a970ef3e662adbfe0d4f5cd980701" "0ld7fcry6ss6fmrpswvr6bikgx299w97h0gwrjjh7kd7rydsjdws"))))) - (inputs - (list ocaml ncurses curl bubblewrap)) - (propagated-inputs - (list ocaml-cmdliner ocaml-dose3 ocaml-mccs ocaml-opam-file-format - ocaml-re)) + (inputs (list ocaml ncurses curl bubblewrap ocaml-cmdliner ocaml-dose3 + ocaml-mccs ocaml-opam-file-format ocaml-re)) + (properties + ;; OPAM is used as a tool and not as a library, we can use the OCaml 4.14 + ;; compiled opam until opam is compatible with OCaml 5.0. + `((ocaml5.0-variant . ,(delay opam)))) (home-page "http://opam.ocamlpro.com/") (synopsis "Package manager for OCaml") (description From patchwork Fri Dec 16 13:25:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45349 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 7487B27BBEB; Fri, 16 Dec 2022 13:26:11 +0000 (GMT) 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 652C827BBE9 for ; Fri, 16 Dec 2022 13:26:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj1-0005nz-VA; Fri, 16 Dec 2022 08:26:07 -0500 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 1p6Aiz-0005lA-Jo for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aiz-00079O-AX for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aiz-00034M-6C for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 06/28] gnu: Add ocaml-psq. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119715011622 (code B ref 60120); Fri, 16 Dec 2022 13:26:05 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:25:50 +0000 Received: from localhost ([127.0.0.1]:49271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aij-00031D-Lt for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:50 -0500 Received: from mout01.posteo.de ([185.67.36.65]:50701) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aih-00030J-KD for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:47 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 20DDD240026 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197142; bh=0s7LTZvxclmYqBTIGHE+wXUdsFXxZa3KwuTKfElU7HM=; h=From:To:Cc:Subject:Date:From; b=MLiNUMGRYP2M8wjDepThep/JvrBfIECLZIx4oqAfIkhoAMHtrwdwOjjDX9bFk4dlt 157y8hnO7Kj6dY43FO8XU3xym6FyG8PTWFYS7ZpXIfl1lUB4wymWBfs2gl+TvBxboS UEoOxZEDErnFar+aAQiJA8qOnz7OXSwW9AiKqvuiVCmec9hVRUMlcYTKQCktvErgJL cxtGMZSTPYfet3xa61jRJaa3vJwZeBies8ljKtXwSBxL21XGpHBtRsu7CSngZx9SfZ kxQ0cM4Uw5geEwuuzfk/4413SBq10XVi8RYABvdyj11wLqcIdUE0v7psiT29ZUdWsT xA4Hl9bi0O1rg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGY51TPz6tml; Fri, 16 Dec 2022 14:25:41 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:05 +0000 Message-Id: <20221216132527.2539-6-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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-psq): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7abb31d183..261de17dbb 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2720,6 +2720,28 @@ (define-public ocaml-mmap @command{Unix.map_file} function added in OCaml >= 4.06.") (license (list license:qpl license:lgpl2.0)))) +(define-public ocaml-psq + (package + (name "ocaml-psq") + (version "0.2.0") + (home-page "https://github.com/pqwy/psq") + (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 + "1cvib0z9ndh83mz9v2xymx8nzvhb9w1yvccp4nx3p8zqsgcnn7d8")))) + (build-system dune-build-system) + (native-inputs (list ocaml-qcheck ocaml-alcotest)) + (synopsis "Functional Priority Search Queues for OCaml") + (description + "This library provides Functional Priority Search Queues for OCaml. +Typical applications are searches, schedulers and caches.") + (license license:isc))) + (define-public ocaml-lwt (package (name "ocaml-lwt") From patchwork Fri Dec 16 13:25:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45359 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 DC90427BBEE; Fri, 16 Dec 2022 13:27:15 +0000 (GMT) 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 2A5D327BBEB for ; Fri, 16 Dec 2022 13:27:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj3-0005pe-8M; Fri, 16 Dec 2022 08:26:09 -0500 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 1p6Aj0-0005le-0K for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aiz-00079Z-OD for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aiz-00034T-Iu for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 07/28] gnu: Add ocaml-monolith. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119716011700 (code B ref 60120); Fri, 16 Dec 2022 13:26:05 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:00 +0000 Received: from localhost ([127.0.0.1]:49289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aiu-00032c-2H for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:00 -0500 Received: from mout02.posteo.de ([185.67.36.66]:58343) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aij-00030P-Bb for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:49 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id D388A240105 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197143; bh=qfUjNguCk1EwCi8hqVvUE+XpojOr07HwU0fP/MSySSc=; h=From:To:Cc:Subject:Date:From; b=OJLuI4OQpFYebWWDIV8bOKiKZJWIBPYZkcKSWMZw6iJ9xTA/8ZANScaWmMNGGc4z0 S5cxCsgRkUtixuukkI0zvusr/WAIl8zDdVDIjlZGTXuxzgZJM+xTrT9AiatY2M/CvZ sbxI4/y8y4UtAs7lJdrN89nuRBAPzDFb3ZVGE/2pZm24+aXuBLftiYk7ZuXAbvo556 2v19B2qSS7Cfrl+lHWLSa1pfOOuzHh5oQz5ifI97QRmAAYxcPOMr3esHHIoJTzjUd0 kRru0MY3WeR1FocJZwoOhQki0/TEuiab7sVvT6Jyk8VvIbKYIhdaiMEXpyOZ8CYXCO CiyK60bFnwBCg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGb34r9z6tmN; Fri, 16 Dec 2022 14:25:43 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:06 +0000 Message-Id: <20221216132527.2539-7-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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-monolith): New variable. --- gnu/packages/ocaml.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 261de17dbb..58eef28558 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8662,6 +8662,29 @@ (define-public ocaml-afl-persistent repeated forking and is much faster.") (license license:expat))) +(define-public ocaml-monolith + (package + (name "ocaml-monolith") + (version "20210525") + (source + (origin + (method url-fetch) + (uri + "https://gitlab.inria.fr/fpottier/monolith/-/archive/20210525/archive.tar.gz") + (sha256 + (base32 + "1fcjpxspdksyrk2gmmk968s6fpkqlyn6zsg2rbz044f5slm39rcx")))) + (build-system dune-build-system) + (arguments `(#:test-target ".")) + (propagated-inputs (list ocaml-afl-persistent ocaml-pprint ocaml-seq)) + (home-page "https://gitlab.inria.fr/fpottier/monolith") + (synopsis "Framework for testing an OCaml library using afl-fuzz") + (description "Monolith offers facilities for testing an OCaml library (for +instance, a data structure implementation) by comparing it against a reference +implementation. It can be used to perform either random testing or fuzz +testing by using the @code{afl-fuzz} tool.") + (license license:lgpl3+))) + (define-public ocaml-pprint (package (name "ocaml-pprint") From patchwork Fri Dec 16 13:25:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45353 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 7C6B027BBED; Fri, 16 Dec 2022 13:26:54 +0000 (GMT) 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 E29BA27BBE9 for ; Fri, 16 Dec 2022 13:26:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj3-0005pT-5y; Fri, 16 Dec 2022 08:26:09 -0500 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 1p6Aj2-0005o3-1L for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aj1-0007A6-Oo for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aj1-000358-H8 for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 08/28] gnu: Add ocaml-optint. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119716111720 (code B ref 60120); Fri, 16 Dec 2022 13:26:07 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:01 +0000 Received: from localhost ([127.0.0.1]:49293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aiu-00032m-QM for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:01 -0500 Received: from mout02.posteo.de ([185.67.36.66]:57385) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aik-00030e-QN for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:51 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 4D313240107 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197145; bh=DNIji+Dt/6bqDYLkzZKRnVHTbXRz9Gtiaj41/z2ntdY=; h=From:To:Cc:Subject:Date:From; b=q48dPMbhMl1Rj/SuoN+pLPaf64MTguw/UVejCtRGEQY4dku6gxj6lILCpd00UWE5l CCY/XVdxeZvfCWYgorfvY2dpAAg8fPermeqjs1kogd9WqUNOvyS8T4F+Xssc/C/TjM ypLBhJ+uFEKeKWEhyaO9TDzij+a+5gXUXf2s0O9bXVgPHllzys9H6EJw4xh6RO/X2b 3yyPpl92+3mhDKJHnpyyLOOIvUqc4IX+g2zVoHhmf/j8p1+vGVnrTQ2WPSNOqeUv5b Jm1AqKOFlM6CFfJpBDUUp3VF+CIp6HJrwMvu/4KU8RbRHf6CjE6kRwtCFTA6kJr/e+ YSef5CwcRc01A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGc6ZGtz6tmR; Fri, 16 Dec 2022 14:25:44 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:07 +0000 Message-Id: <20221216132527.2539-8-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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-optint): New variable. --- gnu/packages/ocaml.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 58eef28558..7118f88318 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2742,6 +2742,31 @@ (define-public ocaml-psq Typical applications are searches, schedulers and caches.") (license license:isc))) +(define-public ocaml-optint + (package + (name "ocaml-optint") + (version "0.2.0") + (home-page "https://github.com/mirage/optint") + (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 + "0d82nf9w46zbyfq3h3n2b9jajvv8gndjyc168xzzk328vj63i12p")))) + (build-system dune-build-system) + (arguments `(#:test-target ".")) + (native-inputs (list ocaml-crowbar ocaml-monolith ocaml-fmt)) + (synopsis "Efficient integer types on 64-bit architectures for OCaml") + (description + "This OCaml library provides two new integer types, @code{Optint.t} and +@code{Int63.t}, which guarantee efficient representation on 64-bit +architectures and provide a best-effort boxed representation on 32-bit +architectures.") + (license license:isc))) + (define-public ocaml-lwt (package (name "ocaml-lwt") From patchwork Fri Dec 16 13:25:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45358 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 A94D427BBED; Fri, 16 Dec 2022 13:27:14 +0000 (GMT) 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 B847227BBEB for ; Fri, 16 Dec 2022 13:27:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj5-0005rQ-5k; Fri, 16 Dec 2022 08:26:11 -0500 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 1p6Aj3-0005pO-1g for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aj2-0007AM-PE for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aj2-00035S-Gt for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 09/28] gnu: Add ocaml-hmap. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119716111734 (code B ref 60120); Fri, 16 Dec 2022 13:26:08 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:01 +0000 Received: from localhost ([127.0.0.1]:49296 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aiv-00032v-54 for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:01 -0500 Received: from mout01.posteo.de ([185.67.36.65]:39145) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Ail-00030k-V5 for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:52 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 72EB8240026 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197146; bh=OKddS+6OjJh5XE2itZdQdBB0/R9/2UvJ7mYHjITnXN8=; h=From:To:Cc:Subject:Date:From; b=gyGYSoWqDcQJJt/Xb1VBeWnn5RlYHW4iqsYMAKxb5wWXlqIpRyaf+LkyzzmEeArca +CCtXXhDvki1pZKT+iTZkzfvvlh4pieyg0DjU02VP2ng6PujpXKAaUm62aUSUjuBxh R3svkPXKXPiQsb9Vz3JPW4+wZMBJOsQ4T7maQTiOLmYof3o7nKSZeDcnAz1spQ+1J5 kRNXRsk1X91niio44Zl+aywITS65v+rQEs16S19kimuhRgX89czYxnbVG4RHZfAj/C SMKjF9bApSJNKwldJCEghcBLECpYhqNVbtbj2puaZVzJ7CQDJ9fQvA6BnTTpGHWhas 8ueGAcFjic6fw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGf0f9nz6tmR; Fri, 16 Dec 2022 14:25:46 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:08 +0000 Message-Id: <20221216132527.2539-9-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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-hmap): New variable. --- gnu/packages/ocaml.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7118f88318..6a7abed03c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2767,6 +2767,32 @@ (define-public ocaml-optint architectures.") (license license:isc))) +(define-public ocaml-hmap + (package + (name "ocaml-hmap") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri "http://erratique.ch/software/hmap/releases/hmap-0.8.1.tbz") + (sha256 + (base32 "10xyjy4ab87z7jnghy0wnla9wrmazgyhdwhr4hdmxxdn28dxn03a")))) + (build-system ocaml-build-system) + (arguments + `(#:build-flags + (list "build" "--tests" "true") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs (list ocaml-topkg ocamlbuild opam)) + (home-page "http://erratique.ch/software/hmap") + (synopsis "Heterogeneous value maps for OCaml") + (description + "Hmap provides heterogeneous value maps for OCaml. These maps bind keys to +values with arbitrary types. Keys witness the type of the value they are bound +to which allows to add and lookup bindings in a type safe manner. ") + (license license:isc))) + (define-public ocaml-lwt (package (name "ocaml-lwt") From patchwork Fri Dec 16 13:25:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45376 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 208D627BBED; Fri, 16 Dec 2022 13:28:14 +0000 (GMT) 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 87AD927BBE9 for ; Fri, 16 Dec 2022 13:28:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj6-0005ry-G6; Fri, 16 Dec 2022 08:26:12 -0500 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 1p6Aj4-0005ql-7K for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aj3-0007Al-S7 for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aj3-00035t-Mf for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 10/28] gnu: Add ocaml5.0-base. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119716211749 (code B ref 60120); Fri, 16 Dec 2022 13:26:09 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:02 +0000 Received: from localhost ([127.0.0.1]:49298 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aiv-00033D-PK for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:02 -0500 Received: from mout01.posteo.de ([185.67.36.65]:56757) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aim-00030q-Tj for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:53 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 68CC524002B for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197147; bh=iipsy3q6VMcQRaw1JMQJF/qf3XKOsMuQbWrrHPxNLoM=; h=From:To:Cc:Subject:Date:From; b=hp/Iu1NP6dDJuSs6F9Ry9bQ3+9lYthhopf7MElhm0tmaK5FzZoAqZCirh3q7zSCez s57JDQXMJxnoRrZdSke7Ol/TzlNbEUi9AawYS2e/0Jyd6Pp2rbTWTqtML7DVdn7kQb Qk924MFNayN/ocuS3OXs5G2W3aqe7L0wHsu4wT5d5rO7hzRsabgmxyB3/SHFKOIa/z e7giTFIhnk0QbKr9HuWZZ+C8Bp+6iO84AhxP+AfeIehaZ1d8M8QH+7lxhOSFnqUYYx M/STfCzyEqt4yJYEX4zQ7Oh5SK/i2KRSAS86Dr6yLvTo7HjNFTja6CWNr1xCxAljXK T4dHyfJK4cBwQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGg0330z6tmS; Fri, 16 Dec 2022 14:25:46 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:09 +0000 Message-Id: <20221216132527.2539-10-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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 (ocaml5.0-base): New variable. --- gnu/packages/ocaml.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6a7abed03c..035a692d08 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5484,7 +5484,8 @@ (define-public ocaml-base (build-system dune-build-system) (propagated-inputs (list ocaml-sexplib0)) - (properties `((ocaml4.07-variant . ,(delay ocaml4.07-base)))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-base)) + (ocaml5.0-variant . ,(delay ocaml5.0-base)))) (synopsis "Full standard library replacement for OCaml") (description @@ -5499,6 +5500,28 @@ (define-public ocaml-base @url{https://github.com/janestreet/stdio, ocaml-stdio}.") (license license:expat))) +(define-public ocaml5.0-base + ;; This version contains fixes for OCaml 5.0 + ;; (see https://github.com/ocaml/opam-repository/pull/21851) + (let ((commit "423dbad212f55506767d758b1ceb2d6e0ee8e7f5") + (revision "0")) + (package-with-ocaml5.0 + (package + (inherit ocaml-base) + (name "ocaml-base") + (version (git-version "0.15.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kit-ty-kate/base") + (commit commit))) + (file-name (git-file-name "ocaml5.0-base" version)) + (sha256 + (base32 + "15vsiv3q53l1bzrvqgspf3lp2104s9dzw62z3nl75f53jvjvsyf6")))) + (properties '()))))) + (define-public ocaml4.07-base (package-with-ocaml4.07 (package From patchwork Fri Dec 16 13:25:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45375 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 5EA3C27BBED; Fri, 16 Dec 2022 13:28:11 +0000 (GMT) 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 0062F27BBEB for ; Fri, 16 Dec 2022 13:28:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj6-0005rz-IF; Fri, 16 Dec 2022 08:26:12 -0500 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 1p6Aj5-0005rM-18 for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aj4-0007Bn-NG for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aj4-000369-Ho for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 11/28] gnu: Update ocaml-ppxlib to 0.25.1. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119716611823 (code B ref 60120); Fri, 16 Dec 2022 13:26:10 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:06 +0000 Received: from localhost ([127.0.0.1]:49300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aiw-00033P-9K for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:06 -0500 Received: from mout01.posteo.de ([185.67.36.65]:51153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Ain-00030x-Pt for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:54 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 4BE5024002C for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197148; bh=Kq5jYtgtEwz9ofJFH6znRkq35/82updD+pMMcFa/UgM=; h=From:To:Cc:Subject:Date:From; b=OsSnW+UBR2lTIx/JcB7EHzRts7smMR4Ibp61JSBp+WZr+dnX+hxZgnjMW5FT4izmK N013gB+tUqH3Fj1tCC+lPb0JxqTpxBAeIBYgph94y++XzlwFNERIAC1IhM8id8ICU8 f7s7Vcq6LfKxLcdXw+yrYm+ESOrPSsIOdINkH+1+Q+ymkq5Pqp/2Q1svYKjU99kCZ3 tzhIRvq7MzSbMnO/INErgkCYXs4yjur425qdcNDx7tmT0ZtaOm7d2eO5CE5cR7RUC1 BwuGItBXJo5T14I0/D0KTW83cCHxkIM5IcRweNQjgstBE6Hvy/3E8Zo1yMABgL+ftG eYCwwxc0XGArw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGg6Prtz6tmY; Fri, 16 Dec 2022 14:25:47 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:10 +0000 Message-Id: <20221216132527.2539-11-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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-ppxlib): Update to 0.25.1. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 035a692d08..1c2a5c9e64 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5674,7 +5674,7 @@ (define-public ocaml-ppx-derivers (define-public ocaml-ppxlib (package (name "ocaml-ppxlib") - (version "0.25.0") + (version "0.25.1") (home-page "https://github.com/ocaml-ppx/ppxlib") (source (origin @@ -5685,7 +5685,7 @@ (define-public ocaml-ppxlib (file-name (git-file-name name version)) (sha256 (base32 - "0wlqvyqy9ccp7z981blv42aqwq7zfq93cakbahjyy48hiiir6vp2")))) + "1402fzv5mg5grf3hb82fqsdkzxk07yfp9hvjh33dzjwjsqfhx3wi")))) (build-system dune-build-system) (arguments `(#:phases From patchwork Fri Dec 16 13:25:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45365 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 82A9827BBED; Fri, 16 Dec 2022 13:27:24 +0000 (GMT) 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 1ED2127BBE9 for ; Fri, 16 Dec 2022 13:27:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj8-0005tg-3y; Fri, 16 Dec 2022 08:26:14 -0500 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 1p6Aj7-0005sN-14 for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:13 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aj6-0007CO-OP for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aj6-00036o-I9 for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 12/28] gnu: Update ocaml-qcheck to 0.20. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119716811879 (code B ref 60120); Fri, 16 Dec 2022 13:26:12 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:08 +0000 Received: from localhost ([127.0.0.1]:49322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aj2-00035K-1A for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:08 -0500 Received: from mout01.posteo.de ([185.67.36.65]:58099) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aip-00031V-Pk for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:56 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 4C7E424002B for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197149; bh=+NsC4ZCMV/oGXrmCdW9MF/AuTpXWseCOhwcaXIRGUS4=; h=From:To:Cc:Subject:Date:From; b=jGP8XbLc0Iq6/OsNVv8luPQId6DeG8o4QLeN2rZE8mcjUr4EyqGi2hIlPWd79xWm0 jLVGN3MolFzcfk4FfIiFKyHjD3zoMuebUy2D+PfyF9i7qTujLQhdSivZ7pcNTVy8SZ l4NSCsFul3B+qNtjM6CmGMRsXyBiQMOXv1UmrfFebpklcNI/6owuT8djnrcW2posfm 6xdcWe8APMQIMiJWvufwbsQNHA5HvhBxJvP9cHldfLs2m5P1gtSCsuR8Nlk5rl6Tw3 mRm/kmyyq0WU8xVnOBooXL5GSNzbi9+TsknKxVLWknXZu/f6UNU2DMKptr4dKETgC+ FbC2RgDzecWgg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGh5mjyz6tms; Fri, 16 Dec 2022 14:25:48 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:11 +0000 Message-Id: <20221216132527.2539-12-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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-qcheck): Update to 0.20. --- gnu/packages/ocaml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1c2a5c9e64..d3e0e0dbc3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1686,7 +1686,7 @@ (define-public ocaml4.07-frontc (define-public ocaml-qcheck (package (name "ocaml-qcheck") - (version "0.18.1") + (version "0.20") (source (origin (method git-fetch) @@ -1695,12 +1695,12 @@ (define-public ocaml-qcheck (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0g3r8lrw6fsdphgpnp08saxyxk1vd3chpmb564ir2qnsp716vz6z")))) + (base32 "1r0m5p1dd06lbgfxqdpl1ya4vb8252z7hqkvdi9k444g4rx2ay3p")))) (build-system dune-build-system) (arguments `(#:test-target ".")) (propagated-inputs - (list ocaml-alcotest ocaml-ounit)) + (list ocaml-alcotest ocaml-ounit ocaml-ppxlib)) (native-inputs (list ocamlbuild)) (properties `((ocaml4.07-variant . ,(delay ocaml4.07-qcheck)))) From patchwork Fri Dec 16 13:25:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45373 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 992AB27BBEB; Fri, 16 Dec 2022 13:28:09 +0000 (GMT) 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 E11BC27BBE9 for ; Fri, 16 Dec 2022 13:28:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj2-0005pG-S4; Fri, 16 Dec 2022 08:26:08 -0500 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 1p6Aj1-0005n8-0D for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aj0-00079s-NC for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aj0-00034m-Hq for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 13/28] gnu: Add ocaml5.0-ppx-expect. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119716011707 (code B ref 60120); Fri, 16 Dec 2022 13:26:06 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:00 +0000 Received: from localhost ([127.0.0.1]:49291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aiu-00032f-Fe for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:00 -0500 Received: from mout02.posteo.de ([185.67.36.66]:58343) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aik-00030P-D7 for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:50 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 1853D240105 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197150; bh=lIZ1ocu3yqxY/Oa/FOEiVeAvfEZ6x8mmJeEUgBdJk7E=; h=From:To:Cc:Subject:Date:From; b=feMhbrmN39uj2mKWueRZk6IqPRuJPuVW0av/VEcaEWIGCeA6BNJFARVNLGG87/u/C ElWaBYGzqSeA8hShiROM/3fVPhqSawE2VSZCnS4lcMkUEmcILkdg6V2HZYT1REMI/n ELCz3DfsmZCJwVcWWsKvXnQ9OZRNNEB8/W2VjwAd/oY8/KmP0jNF3wc+4ITaiP46RQ A1T0xG5plVJPICl9Z2WnpErJkClFtVyAfeEwfOuHG7ZcUkT8SzMIxQgOFDCTaxKTl1 hLBRWQGVOBZavqXgCemo5svoEgfPf+CM7rpzjFlUlabvuvU40VaOS+vq4aWeyUYhFW toU1vxbLJoTVA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGj4mxjz6tm4; Fri, 16 Dec 2022 14:25:49 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:12 +0000 Message-Id: <20221216132527.2539-13-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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 (ocaml5.0-ppx-expect): New variable. --- gnu/packages/ocaml.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d3e0e0dbc3..057c062879 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6754,7 +6754,8 @@ (define-public ocaml-ppx-expect ocaml-migrate-parsetree ocaml-re)) (properties `((upstream-name . "ppx_expect") - (ocaml4.07-variant . ,(delay ocaml4.07-ppx-expect)))) + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-expect)) + (ocaml5.0-variant . ,(delay ocaml5.0-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 @@ -6764,6 +6765,28 @@ (define-public ocaml-ppx-expect to denote the expected output.") (license license:asl2.0))) +(define-public ocaml5.0-ppx-expect + ;; Contains fixes for OCaml 5.0 + ;; (https://github.com/janestreet/ppx_expect/pull/39/). + (let ((commit "83edfc1ee779e8dcdd975e26715c2e688326befa") + (revision "0")) + (package-with-ocaml5.0 + (package + (inherit ocaml-ppx-expect) + (name "ocaml-ppx-expect") + (version (git-version "0.15.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_expect") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05r7wlmrhb5biwyw6bjcpmr77srglijcbf7nm7h2hiil0d0i7bkz")))) + (properties '()))))) + (define-public ocaml4.07-ppx-expect (package-with-ocaml4.07 (package From patchwork Fri Dec 16 13:25:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45360 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 41A5327BBE9; Fri, 16 Dec 2022 13:27:18 +0000 (GMT) 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 C9CC727BBE9 for ; Fri, 16 Dec 2022 13:27:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6AjA-0005wR-5O; Fri, 16 Dec 2022 08:26:16 -0500 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 1p6Aj7-0005t4-Us for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:13 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aj7-0007Cm-HL for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:13 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aj7-000372-Dp for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 14/28] gnu: Update ocaml-odoc to 2.2.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119717011909 (code B ref 60120); Fri, 16 Dec 2022 13:26:13 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:10 +0000 Received: from localhost ([127.0.0.1]:49329 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aj3-00035m-Ay for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:10 -0500 Received: from mout01.posteo.de ([185.67.36.65]:44503) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aiq-00031b-Cw for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:56 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id DC75C24002A for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197150; bh=XfatBg9Oy7vnlWs7f77J5rgBXfl4b785SkmJ2gkrwfc=; h=From:To:Cc:Subject:Date:From; b=K6ZT2jpMmCt2GnFfloAXBvpNSWZj0XTdIoa88ksfppaSALrU/EJdcUWsxcGuMYrAW /vd7vdzQKe5mV8N8SP8/cznheo4+9PIq9qoLYWcsb8WjLaXjQRyMqanCGWWHhm/Gt9 Wg7HPEnF9vbAufAjjL3eR/MtMZodAziX+gArVvTG/5bwc72PSDFvtrACU8l/QtkgTd UmcW4Z5x08RKAFDQUrpO/VWA9Jq8GCBXE0LufpHONAV+nmTwhZNIFcslkNT7uOBOH3 mnmQmQEAbIG5GATUaOVu/2Zrkm53GF61QT6cSx2CKgixgsipT5CiFyfZDCvLIlgQ6P 2O1RUy9l+SwTQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGk3lkqz6tm4; Fri, 16 Dec 2022 14:25:50 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:13 +0000 Message-Id: <20221216132527.2539-14-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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-odoc): Update to 2.2.0. --- gnu/packages/ocaml.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 057c062879..5383972eb6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -7805,9 +7805,7 @@ (define-public ocaml4.07-bisect-ppx (define-public ocaml-odoc (package (name "ocaml-odoc") - ;; 2.2.0-alpha contains fixes for Dune 3.0 compatibility - ;; (https://github.com/ocaml/odoc/commit/6ac97f3148f7791ec7451785ef4dbd9ca0daf2d1) - (version "2.2.0-alpha") + (version "2.2.0") (source (origin (method git-fetch) @@ -7816,7 +7814,7 @@ (define-public ocaml-odoc (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "07zjkk455l51i29lcayzrc1q8j5bvbv97sscv8yhcj7x6h6q2nag")))) + (base32 "19mww1lyrdi705aw3lwql6xc7p11fcq5gprmhyxpb4x80gnvlzrh")))) (build-system dune-build-system) (arguments `(#:tests? #f; not compatible with current version of ocaml-yojson From patchwork Fri Dec 16 13:25:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45354 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 F169027BBF0; Fri, 16 Dec 2022 13:27:01 +0000 (GMT) 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 5CA6327BBEB for ; Fri, 16 Dec 2022 13:27:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6AjB-0005x8-Mm; Fri, 16 Dec 2022 08:26:17 -0500 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 1p6Aj8-0005ux-9U for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:14 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aj8-0007D6-0f for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:14 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aj7-000379-PZ for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 15/28] gnu: Add ocaml5.0-crowbar. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119717011922 (code B ref 60120); Fri, 16 Dec 2022 13:26:13 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:10 +0000 Received: from localhost ([127.0.0.1]:49332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aj4-000362-61 for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:10 -0500 Received: from mout01.posteo.de ([185.67.36.65]:43029) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Air-00031h-96 for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:57 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id C1630240029 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197151; bh=6notl1aoLiezQw/e+fP3H4JDEZkVFZaLE4NXKpNnm0Y=; h=From:To:Cc:Subject:Date:From; b=PdlPvFg4LFmzUX/Ipx8ytMud9YMH66xUgOFwEZwzcr2CuaHoxRRNy9RAnsjAH3ZMb PvcNujq4dUNCmNHRwwPN2g5YlwpCWwqyTNetqRlKVcBgBpabxaCZp0xcKqmoaXGuAO aNW0iRhwLE1a5Ij1SZevWCDXxwYSJrCwf2MiUicK76Y8jhfujc+VCDKg510FU5kBtO kSEHn0JK3G20UUYWKHAO2u/9XdVbSvMBTxM5AID57tUOayTf75QEI2t/zKs9MWrXD8 pN0VLbL5aF6z0oI+KC0Kb59rOt22wei698GX70stGNBpWyEMhhFS0IsS5pj2xNHClc SQ4xdoxleAluQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGl2MHnz6tm4; Fri, 16 Dec 2022 14:25:51 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:14 +0000 Message-Id: <20221216132527.2539-15-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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 (ocaml5.0-crowbar): New variable. --- gnu/packages/ocaml.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5383972eb6..0998d6cd09 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8834,12 +8834,21 @@ (define-public ocaml-crowbar ocaml-uunf ocaml-uutf ocaml-pprint)) + (properties `((ocaml5.0-variant . ,(delay ocaml5.0-crowbar)))) (synopsis "Ocaml library for tests, let a fuzzer find failing cases") (description "Crowbar is a library for testing code, combining QuickCheck-style property-based testing and the magical bug-finding powers of @uref{http://lcamtuf.coredump.cx/afl/, afl-fuzz}.") (license license:expat))) +(define-public ocaml5.0-crowbar + (package-with-ocaml5.0 + (package + (inherit ocaml-crowbar) + ;; Tests require ocaml-calendar which does not work with OCaml 5.0 + (arguments `(#:tests? #f)) + (properties '())))) + (define-public ocaml-eqaf (package (name "ocaml-eqaf") From patchwork Fri Dec 16 13:25:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45352 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 9F90627BBED; Fri, 16 Dec 2022 13:26:50 +0000 (GMT) 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 1779427BBEB for ; Fri, 16 Dec 2022 13:26:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6AjB-0005wh-1v; Fri, 16 Dec 2022 08:26:17 -0500 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 1p6Aj8-0005vW-O6 for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:14 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aj8-0007DM-FZ for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:14 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aj8-00037G-AG for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:14 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 16/28] gnu: Add ocaml-lwt-dllist. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119717111930 (code B ref 60120); Fri, 16 Dec 2022 13:26:14 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:11 +0000 Received: from localhost ([127.0.0.1]:49335 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aj4-00036K-PQ for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:11 -0500 Received: from mout02.posteo.de ([185.67.36.66]:60433) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Ais-00031n-41 for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:58 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 9BD0F240103 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197152; bh=9Uo4fAD3Veyds3OXttyNwzRtWVw1C8clgQHWuMAuSWg=; h=From:To:Cc:Subject:Date:From; b=MkVwjsMHMxVGwVu7/2aA1tKg249nRSJzUOkapZTfHufz9xSHHSjMH8d7MTKSUzJrp X2uqjXeG/0mNU1LMhUuR+WXOg7BYZLbLpu2mvtdOTuU4gTaLSjvpLItadVHmJqRAAn PUM4eyhahBsKATa5sYRFLK4cbN0AeDkNizKDGw61aY6sWn00K5slyNZ74cHFnl2ZHy WW36NsHtuC3Y3H0DAXPJNgP+DX7TJPoAInOehF6seupvKVMbKkavaZoFB322hmntH2 669ajWHlZ688XvpwbvL9Oum39zFjGFnm22eT0HKo7Zp/w6DMObg3AqislewLEYKBpp +IU3ndVD1Ms7g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGm1Hxbz6tmR; Fri, 16 Dec 2022 14:25:52 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:15 +0000 Message-Id: <20221216132527.2539-16-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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-lwt-dllist): New variable. --- gnu/packages/ocaml.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0998d6cd09..bcd88c8637 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2823,6 +2823,27 @@ (define-public ocaml-lwt locks or other synchronization primitives.") (license license:lgpl2.1))) +(define-public ocaml-lwt-dllist + (package + (name "ocaml-lwt-dllist") + (version "1.0.1") + (home-page "https://github.com/mirage/lwt-dllist") + (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 + "18bi8fb4yly1pyf43pjvvdhlyzb3wkgxifffx9d1g9y2mwsng6jw")))) + (build-system dune-build-system) + (native-inputs (list ocaml-lwt)) + (synopsis "OCaml library providing mutable doubly-linked list with Lwt iterators") + (description "This OCaml library provides an implementation of a mutable +doubly-linked list with Lwt iterators.") + (license license:expat))) + (define-public ocaml-luv (package (name "ocaml-luv") From patchwork Fri Dec 16 13:25:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45351 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 BEE2127BBED; Fri, 16 Dec 2022 13:26:24 +0000 (GMT) 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 4364F27BBE9 for ; Fri, 16 Dec 2022 13:26:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj9-0005w2-CP; Fri, 16 Dec 2022 08:26:15 -0500 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 1p6Aj6-0005rh-0i for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aj5-0007C1-Ht for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aj5-00036S-CT for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 17/28] gnu: Add ocaml5.0-ctypes Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119716711842 (code B ref 60120); Fri, 16 Dec 2022 13:26:11 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:07 +0000 Received: from localhost ([127.0.0.1]:49314 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aj0-00034f-7p for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:07 -0500 Received: from mout01.posteo.de ([185.67.36.65]:56757) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Ain-00030q-RB for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:54 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 7C8C3240028 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197153; bh=1nWCi+yAb2UUZWIFfMgL7LL6CdpwiXA2wiEX8jrW7N0=; h=From:To:Cc:Subject:Date:From; b=lFe9S/lWN8wmJpqaW23zWLSzlt2n8WpaX5rUVakrlgUjMINyMYxDW7VK5lfbs93kY M1BTM20YWsRyLpFOeGHfv2so3ePCKATWJfEM+RkE4Xt0ei8Fjxq/ZaViHwmmIhpMFr F/Tw1MZSYnPzR2pJmm7HHHHRkRV3QTID/sMjPOvFf3mGiLvN/z7Qray9G1c90MiwAf +c7f1GWlbcB1U0y8Q/SAlGlrhFzBEwUbY6QOg8FsyK4NT1HxTEeO34ijg9SZt+B4nT cpNCMS8gPg7XJRgD78sA4eP5ltHxTfGiSx4VnOGaBd8YqE/BoHi+KLbloZruaFk4pb b61cizmV/yAUg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGn0N8lz6tmc; Fri, 16 Dec 2022 14:25:53 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:16 +0000 Message-Id: <20221216132527.2539-17-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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 (ocaml5.0-ctypes): New variable. --- gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bcd88c8637..7fbaed69ad 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4797,6 +4797,7 @@ (define-public ocaml-ctypes ("integers" ,ocaml-integers))) (inputs (list libffi)) + (properties `((ocaml5.0-variant . ,(delay ocaml5.0-ctypes)))) (synopsis "Library for binding to C libraries using pure OCaml") (description "Ctypes is a library for binding to C libraries using pure OCaml. The primary aim is to make writing C extensions as straightforward as @@ -4807,6 +4808,33 @@ (define-public ocaml-ctypes without writing or generating any C!") (license license:expat))) +(define-public ocaml5.0-ctypes + ;; Contains fix to support OCaml 5.0 + ;; (https://github.com/ocamllabs/ocaml-ctypes/pull/709) + (let ((commit "52ff621f47dbc1ee5a90c30af0ae0474549946b4") + (revision "0")) + (package-with-ocaml5.0 + (package + (inherit ocaml-ctypes) + (name "ocaml-ctypes") + (version (git-version "0.20.1" revision commit)) + (home-page "https://github.com/ocamllabs/ocaml-ctypes") + (arguments + (append + ;; Some tests fail. Failure seems to be due to OCaml 5.0. + `(#:tests? #f) + (package-arguments ocaml-ctypes))) + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vyiryqchz0mdfhal7bdivqsk5yhvzzckrqv495rlpbdxzklcp7g")))) + (properties '()))))) + (define-public ocaml-ocb-stubblr (package (name "ocaml-ocb-stubblr") From patchwork Fri Dec 16 13:25:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45372 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 0558F27BBEE; Fri, 16 Dec 2022 13:27:59 +0000 (GMT) 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 B6F4127BBE9 for ; Fri, 16 Dec 2022 13:27:58 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj7-0005sy-Ry; Fri, 16 Dec 2022 08:26:13 -0500 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 1p6Aj6-0005rx-Fx for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aj6-0007CB-6s for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:12 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aj6-00036c-1V for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:12 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 18/28] gnu: Add ocaml-bechamel. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119716811865 (code B ref 60120); Fri, 16 Dec 2022 13:26:12 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:08 +0000 Received: from localhost ([127.0.0.1]:49318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aj1-00034x-2N for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:07 -0500 Received: from mout01.posteo.de ([185.67.36.65]:51153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aio-00030x-KU for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:55 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 50C4B240028 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197154; bh=WRsGW1Tw7ANKvN8wypMq9fC48+SEfKBmaOhrRj9g7cU=; h=From:To:Cc:Subject:Date:From; b=my3cAX9nCmfl3JksvpjTT4qhe0/yENjPU0zmIR52Km8Y8JD47FuYVOWBFRSZYFk1x TVHq8EsGl5SPTo4Eo2kNbc5uSnjIpxlf5Lr4VINbHMQz2LSXaC/Bpfjq75/d9eKSk8 PANry/UhXlDByd4Y8FTcl55LS/B9GBmZ5eCyl2eRwCpY1gvAUwIoWISh+OHJiPTqWI sFSCqb5Ghba/p3JkObPAqsN5HQv8cdjmNg76enbrhEKzuTthqTsOG8kACz3WlACLjk L4BJx+UprYAR0GcffSfM010fzqsKwJ0PizTKVux2jYl9PnUe+p9pVDLdDqaIHREmhc Ff1AdBZT5YYlQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGn6K79z6tmc; Fri, 16 Dec 2022 14:25:53 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:17 +0000 Message-Id: <20221216132527.2539-18-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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-bechamel): New variable. --- gnu/packages/ocaml.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 7fbaed69ad..3bceb9c3d3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3607,6 +3607,30 @@ (define-public ocaml-benchmark is used to determine whether the results truly differ.") (license license:lgpl3+))) +(define-public ocaml-bechamel + (package + (name "ocaml-bechamel") + (version "0.3.0") + (home-page "https://github.com/mirage/bechamel") + (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 "1x7sf45iy5dzx7kknbkkvpna42rcwpj5p55y0nqsg2fb4srj0b1q")))) + (build-system dune-build-system) + (arguments `(#:package "bechamel")) + (propagated-inputs (list ocaml-fmt ocaml-stdlib-shims)) + (synopsis "Yet Another Benchmark in OCaml") + (description + "BEnchmark for a CHAMEL/camel/caml which is agnostic to the system. It's a +micro-benchmark tool for OCaml which lets the user to re-analyzes and prints +samples.") + (license license:expat))) + (define-public ocaml-batteries (package (name "ocaml-batteries") From patchwork Fri Dec 16 13:25:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45366 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 30D0D27BBEE; Fri, 16 Dec 2022 13:27:25 +0000 (GMT) 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 F315E27BBE9 for ; Fri, 16 Dec 2022 13:27:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Ajy-0006VE-I5; Fri, 16 Dec 2022 08:27:06 -0500 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 1p6Ajv-0006Ph-Va for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Ajv-0007VW-NK for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Ajv-00039c-JJ for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 19/28] gnu: ocaml-mdx: Move inputs to propagated-inputs. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119719512035 (code B ref 60120); Fri, 16 Dec 2022 13:27:03 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:35 +0000 Received: from localhost ([127.0.0.1]:49352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6AjT-00037x-8Z for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:35 -0500 Received: from mout02.posteo.de ([185.67.36.66]:50607) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aiu-000328-PZ for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:01 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 49882240103 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197155; bh=x49EtrS2OkABtHKvUKReQXCOzYSqpeKxc0A2EugEIuA=; h=From:To:Cc:Subject:Date:From; b=QL5OQjs+AXZb2dce3fVjxBxst8okGzyFyY0cUMVMWkf6/C92xWRbhYJsmdAt1TljA Lf0E6w7+qPSjNwWD9RPVpnfdNmHR5OcvPbXx8gukrlC32gI+ysMIAbUqxG2PFmgHx0 cMjExdxa3LZJCnZrko3seux7k2B0MKejM/cej9FOMFPk2X3/gRcwI5zI1GUUtoLpG4 5weBLctmemmADSRunQBMsyN22nL+wq422Xz+eZu3zpx2GapxRlSvWKJWSHDk1wZZ9L 0gxMHc3uCD222pN+Jtfj4/LPoE5MsqJcsqQAzRLJiIP8T2tJvMsPlXJqKXtCcVbDnu jbp4/FKROFdJw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGp4j0Fz6tmc; Fri, 16 Dec 2022 14:25:54 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:18 +0000 Message-Id: <20221216132527.2539-19-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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): Move inputs to propagated-inputs. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3bceb9c3d3..148502f26f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -8139,7 +8139,7 @@ (define-public ocaml-mdx (("`") "'") (("COMMAND") "[COMMAND]") (("\\.\\.\\.") "…"))))))) - (inputs + (propagated-inputs (list ocaml-fmt ocaml-astring ocaml-logs From patchwork Fri Dec 16 13:25:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45350 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 6CED327BBED; Fri, 16 Dec 2022 13:26:22 +0000 (GMT) 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 E125D27BBE9 for ; Fri, 16 Dec 2022 13:26:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Aj9-0005wN-U4; Fri, 16 Dec 2022 08:26:15 -0500 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 1p6Aj7-0005sk-DM for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:13 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aj7-0007CZ-4E for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:13 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aj7-00036v-0Z for guix-patches@gnu.org; Fri, 16 Dec 2022 08:26:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 20/28] gnu: Add ocaml5.0-eio. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:26:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119716911894 (code B ref 60120); Fri, 16 Dec 2022 13:26:12 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:09 +0000 Received: from localhost ([127.0.0.1]:49326 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aj2-00035W-LA for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:09 -0500 Received: from mout01.posteo.de ([185.67.36.65]:51153) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aiq-00030x-8P for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:25:56 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id E6C9D240028 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197155; bh=+Fwo1wEQ5etj0S+XmjiM/3mzAlvV0F2pta0RoKuiJNo=; h=From:To:Cc:Subject:Date:From; b=RUjFnP1xkbfcDmqbdvr44S+M7ipeYKA+a1yWgmy5zb9FLvy8wKeg1nKf0C/7XJwt1 Xodoe4OfKdCQ36B722cFmKtLutD/fDJIkb2+VQG54cWix2SxDOCh8blchnHQJdD8Np 1JrV8DXEODo19V1N43MTH7p7BkPm4jGzH08e2Tq8BlX1a4KU1pOpwMmK4GRqZXRYWo ludwzU/bb+bq/5ygAb7M6Xii+T0/qTA/OWOnscXQKMbkx1KJde2xDyNfmRiZMAr8vu JpbZlf6FvTWbhln7VMkPW+SIPuCEvgpQCNSKqfErVPj4WcgcYFnCdpEuoAsh9hj9J3 yXmZhSJwfF+wg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGq3h6tz6tmc; Fri, 16 Dec 2022 14:25:55 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:19 +0000 Message-Id: <20221216132527.2539-20-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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 (ocaml5.0-eio): New variable. --- gnu/packages/ocaml.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 148502f26f..02173421d9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2793,6 +2793,42 @@ (define-public ocaml-hmap to which allows to add and lookup bindings in a type safe manner. ") (license license:isc))) +(define ocaml-eio + (package + (name "ocaml-eio") + (version "0.7") + (home-page "https://github.com/ocaml-multicore/eio") + (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 + "118raxdwv6pn5b152ffdhmwdi0l4wlwflcj2nmckfmm7v1z2fq4s")))) + (build-system dune-build-system) + (arguments `(#:package "eio" + #:test-target ".")) + (propagated-inputs (list ocaml-bigstringaf + ocaml-cstruct + ocaml-lwt + 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)) + (synopsis "Effect-based direct-style IO API for OCaml") + (description "An effect-based IO API for multicore OCaml with fibers.") + (license license:isc))) + +(define-public ocaml5.0-eio + (package-with-ocaml5.0 ocaml-eio)) + (define-public ocaml-lwt (package (name "ocaml-lwt") From patchwork Fri Dec 16 13:25:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45363 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 B130A27BBF0; Fri, 16 Dec 2022 13:27:22 +0000 (GMT) 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 D87A627BBE9 for ; Fri, 16 Dec 2022 13:27:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Ajw-0006Rf-R6; Fri, 16 Dec 2022 08:27:04 -0500 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 1p6Aju-0006OW-Of for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aju-0007VC-Fc for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aju-00039H-AN for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 21/28] gnu: Add ocaml5.0-eio-luv. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119719412014 (code B ref 60120); Fri, 16 Dec 2022 13:27:02 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:34 +0000 Received: from localhost ([127.0.0.1]:49346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6AjS-00037h-BU for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:34 -0500 Received: from mout02.posteo.de ([185.67.36.66]:54267) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aiw-00032O-7Z for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:02 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id B6ED2240103 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:56 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197156; bh=uhOCLxHr9Gjd2N0YCXVzw4TolJl/zAtCefJ4Plz5pP8=; h=From:To:Cc:Subject:Date:From; b=j6LkKXXOyMB9YkY2FjbsBbXoM1lpQiPGLorkrH/YMWeNNik2csW5dkJtqJMBS8ous nDAZNPAjNg2Is9euuNJBGJ7q7sO3VSyEHrn2jBAMgW/HA4coKErEAWATo79ruWe3Gw TIxK3k5WuCl9IkO8VInzB7bURYFqp2TYHpv75SmHGu6wwbLL8T0IvaL5saUI6/FdXY G9swY4Tv+qHNJRwJAit0nfqqLCxQGacDUxptM/91DameZ9ScFCHScOENNPJnLqF3cB kHZ3sDV8uHd5ZCFYlv7sY5mybXPuBK/zH6cN/fF4f+1S3VD5dCOJEjHX7gOuE8MfqM 2RwyK7izE0/TQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGr2Fl4z6tmS; Fri, 16 Dec 2022 14:25:56 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:20 +0000 Message-Id: <20221216132527.2539-21-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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 (ocaml5.0-eio-luv): New variable. --- gnu/packages/ocaml.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 02173421d9..afad994d8d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2829,6 +2829,19 @@ (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" + #:test-target ".")) + (propagated-inputs (list ocaml-eio ocaml-luv)) + (native-inputs + (list ocaml-mdx)))) + +(define-public ocaml5.0-eio-luv + (package-with-ocaml5.0 ocaml-eio-luv)) + (define-public ocaml-lwt (package (name "ocaml-lwt") From patchwork Fri Dec 16 13:25:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45374 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 8174727BBE9; Fri, 16 Dec 2022 13:28:10 +0000 (GMT) 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 28E7027BBED for ; Fri, 16 Dec 2022 13:28:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Ajx-0006S7-8z; Fri, 16 Dec 2022 08:27:05 -0500 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 1p6Ajv-0006P8-Bi for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Aju-0007VK-Rt for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Aju-00039O-MR for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 22/28] gnu: Add ocaml-uring. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119719512021 (code B ref 60120); Fri, 16 Dec 2022 13:27:02 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:35 +0000 Received: from localhost ([127.0.0.1]:49348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6AjS-00037j-Kd for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:34 -0500 Received: from mout02.posteo.de ([185.67.36.66]:49179) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aix-00032U-0i for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:03 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 81080240101 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197157; bh=5l4cpP9/9V9gmaj+1vlQAob8lKr9XkNuR9FxiJJ20bw=; h=From:To:Cc:Subject:Date:From; b=sOrmLZ4NokYBJdGM9G09lNmEq/eolKPju3gOSiTYLTheMWnRcqyYajCVHxQqQsYpo 9s3SklIQCrvwrA62wNw3oLtuiTdw6GU1eChQ5MMCIby/ynFLrNuv0yMa4wsm8UO8Iu NdQVKYS2JbuXor5hNI1lJ7k2Q92wbH1hN87AcnyN49mPInvw3Pfp2HPhfQA5SJnjVT 9W9By/flEWsLcCWGa+FTpSXGA9m/+imoR8eTuQRVgQVnIrprCsU+JFHL98DBD6HVrM yjLreJID6heOm0wyJwuDO0k3Id9Zyh8VWNy/lvJvqv1DawJoUKfQdIY4BI1bIB+864 Nq8eu+f2wjYtA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGs0fJpz6tn4; Fri, 16 Dec 2022 14:25:57 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:21 +0000 Message-Id: <20221216132527.2539-22-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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-uring): New variable. --- gnu/packages/ocaml.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index afad994d8d..d413d54f63 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2842,6 +2842,37 @@ (define ocaml-eio-luv (define-public ocaml5.0-eio-luv (package-with-ocaml5.0 ocaml-eio-luv)) +(define-public ocaml-uring + (package + (name "ocaml-uring") + (version "0.4") + (home-page "https://github.com/ocaml-multicore/ocaml-uring") + (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 + "0k70y7nb2wrk2yql0pwnrhsp1x7k9ld4gd8iihbv6r34kcm3a5m1")))) + (build-system dune-build-system) + (arguments `(#:test-target ".")) + (propagated-inputs + (list ocaml-cstruct + ocaml-fmt + ocaml-optint)) + (native-inputs + (list ocaml-lwt + ocaml-bechamel + ocaml-logs + ocaml-cmdliner + ocaml-mdx)) + (synopsis "OCaml bindings for Linux io_uring") + (description "OCaml bindings to the Linux io_uring kernel IO interfaces.") + (license + (list license:isc license:expat)))) + (define-public ocaml-lwt (package (name "ocaml-lwt") From patchwork Fri Dec 16 13:25:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45361 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 E55D727BBEB; Fri, 16 Dec 2022 13:27:20 +0000 (GMT) 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 710AB27BBE9 for ; Fri, 16 Dec 2022 13:27:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Ajw-0006Rc-PI; Fri, 16 Dec 2022 08:27:04 -0500 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 1p6Ajv-0006PN-HB for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Ajv-0007VQ-9N for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Ajv-00039V-59 for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 23/28] gnu: Add ocaml5.0-eio-linux. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119719512028 (code B ref 60120); Fri, 16 Dec 2022 13:27:03 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:35 +0000 Received: from localhost ([127.0.0.1]:49350 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6AjS-00037q-Vg for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:35 -0500 Received: from mout02.posteo.de ([185.67.36.66]:42373) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aix-00032a-Sw for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:04 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 63755240103 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197158; bh=FhBv/DlEgXbPu2DLDaZjFOAfN0ID1FQ91Da/LH1ZhAs=; h=From:To:Cc:Subject:Date:From; b=AJWfPH+OKxtcyAP4131ii8qoETaINiyXJIlP2L6+KvsbRcUHfEYYoDRfgwgMYnvAQ WKvjbsxJ87Rn+Co4T4odZ72bvhs/emM7lqOsYy4Rm2PfrR8wwYcI5SAv/GugIapCfx kAFXSCQGU8xHsQcZOVnepb+8F09ymp5BPXsSJCBvnk8hvvVMLhezBdTwcjG8gwznFb DOfGVojlbPgbMsn1d+gQygmi+1rZQt880ni5wgWHRqg3zw8/jq2x2nvPvXJmejcJ1J yAIscqxudK+NRjYQTwmylmH6WfGWdecesDv7P4TiyLweWMC4yVOTklJKKpAiSfGZNg vkTJKEsGUSveQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGs6plYz6tmS; Fri, 16 Dec 2022 14:25:57 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:22 +0000 Message-Id: <20221216132527.2539-23-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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 (ocaml5.0-eio-linux): New variable. --- gnu/packages/ocaml.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index d413d54f63..1dc1341555 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2873,6 +2873,25 @@ (define-public ocaml-uring (license (list license:isc license:expat)))) +(define ocaml-eio-linux + (package + (inherit ocaml-eio) + (name "ocaml-eio-linux") + (arguments `(#:package "eio_linux" + #:test-target ".")) + (propagated-inputs + (list ocaml-eio + ocaml-uring + ocaml-logs + ocaml-fmt)) + (native-inputs + (list ocaml-mdx + ocaml-alcotest + ocaml-mdx)))) + +(define-public ocaml5.0-eio-linux + (package-with-ocaml5.0 ocaml-eio-linux)) + (define-public ocaml-lwt (package (name "ocaml-lwt") From patchwork Fri Dec 16 13:25:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45370 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 5792B27BBEB; Fri, 16 Dec 2022 13:27:57 +0000 (GMT) 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 D362227BBE9 for ; Fri, 16 Dec 2022 13:27:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Ajz-0006Wp-Hs; Fri, 16 Dec 2022 08:27:07 -0500 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 1p6Ajx-0006TL-Rp for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Ajx-0007WM-Jp for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Ajx-0003AB-FL for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 24/28] gnu: Add ocaml5.0-eio-main. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:27:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119719712076 (code B ref 60120); Fri, 16 Dec 2022 13:27:05 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:37 +0000 Received: from localhost ([127.0.0.1]:49364 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6AjV-00038d-Ax for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:37 -0500 Received: from mout01.posteo.de ([185.67.36.65]:34005) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aiy-00032b-LU for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:19 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2AAC124002B for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:25:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197159; bh=o58RgD62OUaNP0lUxI/bsjWYt/GOLXpRz1TwJTyM07Q=; h=From:To:Cc:Subject:Date:From; b=j3BHMhYWfVX/vtyKpsqD/e9s0wScmhc0OiYguDiUaQUk7NTF7hyGb4ePsyMkLtYmO 7uig+vyuCxRb+2WPQBR4PwnHtk07UlX7EQKFzck+uznz+rPKjp35+o7Zn+69iD+e02 rOApQ5nDoCtH8mMl/6H2bnlmagQwi79Bocg5rnwLRCUhqXGeQMyf/N0twHDKSp7mZl IpazeEl3oaId0irj7LL3EsOGiwACCPdO1in0mszF0bknpyUGhu+sDzc3cVHFe/AS5p Wmb5O6IWYKuYw4P8iM85x9mc9uHP+8+xcoSxcb6hSNwekR5wXCCto6EJLoMKS8kBu2 gubJcB7R1LkXA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGt5Bxjz6tmS; Fri, 16 Dec 2022 14:25:58 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:23 +0000 Message-Id: <20221216132527.2539-24-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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 (ocaml5.0-eio-main): New variable. --- gnu/packages/ocaml.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1dc1341555..8ad56336dd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2892,6 +2892,24 @@ (define ocaml-eio-linux (define-public ocaml5.0-eio-linux (package-with-ocaml5.0 ocaml-eio-linux)) +(define ocaml-eio-main + (package + (inherit ocaml-eio) + (name "ocaml-eio-main") + (arguments `(#:package "eio_main" + #:test-target "." + ;; tests require network + #:tests? #f)) + (propagated-inputs + (list ocaml-eio + ocaml-eio-luv + ocaml-eio-linux)) + (native-inputs + (list ocaml-mdx)))) + +(define-public ocaml5.0-eio-main + (package-with-ocaml5.0 ocaml-eio-main)) + (define-public ocaml-lwt (package (name "ocaml-lwt") From patchwork Fri Dec 16 13:25:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45369 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 CE8C727BBEE; Fri, 16 Dec 2022 13:27:56 +0000 (GMT) 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 9109727BBEB for ; Fri, 16 Dec 2022 13:27:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Ajz-0006WY-8B; Fri, 16 Dec 2022 08:27:07 -0500 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 1p6Ajw-0006QT-Ge for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Ajw-0007Vh-5W for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Ajw-00039j-0Y for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 25/28] gnu: Update ocaml-merlin-lib to 4.7-414. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:27:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119719512042 (code B ref 60120); Fri, 16 Dec 2022 13:27:03 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:35 +0000 Received: from localhost ([127.0.0.1]:49354 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6AjT-000384-Gx for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:35 -0500 Received: from mout02.posteo.de ([185.67.36.66]:49409) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aiz-00032d-Gg for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:06 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 0607F240101 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:26:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197160; bh=SAN7YxEO4hhK0syWblHTcVGmUHmCxP9ZNy1+PIFISn4=; h=From:To:Cc:Subject:Date:From; b=Z4Qts/u9caRApi6y/3AaldTe3n9A+6TD/XhmI+EBxMUZ+oq/deiBIWBxDVsyDwGso azJrttqY0nvO6gJ5OqBxUG73FRR7uaPNufR7fb9F2FK1VCRBUWjTMAYFtSDVAYWY4q GVLaAM2B93BkqSGzKOj1z3g2lYprPn+i4bGjWZdbwsdiuO+OmKlMfqX8T8wy7EQJmf /BFx2wbtKan5i8GtyYblNy/U2QukvdfTq436EJhiEM1ep4kYcXNk6fRBsGgq+aa/qa cOAq38nkxwYdi90oI8YC9/g1MfbsG5IUsoNWX9P0DuLCiZg92I1xSyisgX/GnqVsHd rRwF8C9tsUcjg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGv47lxz6tm4; Fri, 16 Dec 2022 14:25:59 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:24 +0000 Message-Id: <20221216132527.2539-25-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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-merlin-lib): Update to 4.7-414. --- gnu/packages/ocaml.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8ad56336dd..f9dc9998c1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5355,7 +5355,7 @@ (define-public ocaml-yojson (define-public ocaml-merlin-lib (package (name "ocaml-merlin-lib") - (version "4.6-414") + (version "4.7-414") (source (origin (method git-fetch) @@ -5365,7 +5365,7 @@ (define-public ocaml-merlin-lib (file-name (git-file-name name version)) (sha256 (base32 - "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh")))) + "1bd4j2zq0lyszbkibgky1z9swv4scb7ljww3fv1kqy0cya743b5l")))) (build-system dune-build-system) (arguments '(#:package "merlin-lib" #:tests? #f)) ; no tests @@ -5402,7 +5402,9 @@ (define-public ocaml-merlin (propagated-inputs (list ocaml-merlin-lib ocaml-yojson)) (native-inputs (list ocaml-dot-merlin-reader ; required for tests - ocaml-mdx jq)) + ocaml-ppxlib + ocaml-mdx + jq)) (synopsis "Context sensitive completion for OCaml in Vim and Emacs") (description "Merlin is an editor service that provides modern IDE features for OCaml. Emacs and Vim support is provided out-of-the-box. From patchwork Fri Dec 16 13:25:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45367 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 CA6C727BBED; Fri, 16 Dec 2022 13:27:40 +0000 (GMT) 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 36BD627BBE9 for ; Fri, 16 Dec 2022 13:27:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Ak0-0006YR-SR; Fri, 16 Dec 2022 08:27:08 -0500 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 1p6Ajw-0006Rj-SN for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Ajw-0007Vp-HB for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Ajw-00039q-C6 for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 26/28] gnu: Add ocaml5.0-merlin-lib. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:27:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119719612049 (code B ref 60120); Fri, 16 Dec 2022 13:27:04 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:36 +0000 Received: from localhost ([127.0.0.1]:49356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6AjT-00038B-Rv for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:36 -0500 Received: from mout02.posteo.de ([185.67.36.66]:54477) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aj0-000334-CT for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:07 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id D916D240105 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:26:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197160; bh=FRcuykeBeV7g0b10my95kJ6tzpufv2aB9hZyzJDs/lk=; h=From:To:Cc:Subject:Date:From; b=YrV4Jdfp8ULm9Qok6wk5BekXN1YyFVK0mw0vqkTqc4JqWTaqgJL2WbAKVZWscd7uB Q9mT3YfWow69fpv9ZIzBegPL43FlCDLQBesLDnBksPSi3VKVSIk6ey9J+fDBHCRjOn lL8FZzjfR5Sn65v/AUqDm9LPK+m0w9PtCqM+DMptCbpXqV3pb88i07Kc+1nVMLRx6P LfGJuMz5tfUBN/RKKBI3kOFmZX2lRdvwm2TcrgxhbbBdY1jAkxLKC68Fkgr9XAAYgx mP5je0x5VhYKZ3Mo9ivrBErURLk0axZPIFr287PfRcF+B9kJg2NBrhE+YABVMM5qGf MQ9kksmcsOarg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGw2Zxlz6tm4; Fri, 16 Dec 2022 14:26:00 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:25 +0000 Message-Id: <20221216132527.2539-26-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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 (ocaml5.0-merlin-lib): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f9dc9998c1..1b3e51001f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5370,12 +5370,34 @@ (define-public ocaml-merlin-lib (arguments '(#:package "merlin-lib" #:tests? #f)) ; no tests (propagated-inputs (list ocaml-csexp ocaml-menhir)) + (properties `((ocaml5.0-variant . ,(delay ocaml5.0-merlin-lib)))) (home-page "https://ocaml.github.io/merlin/") (synopsis "Merlin libraries") (description "These libraries provides access to low-level compiler interfaces and the standard higher-level merlin protocol.") (license license:expat))) +;; the 500 indicates that this version is for OCaml 5.0 +(define ocaml-merlin-lib-500 + (package + (inherit ocaml-merlin-lib) + (name "ocaml-merlin-lib") + (version "4.7.1-500") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/merlin") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01")))) + (properties '()))) + +(define-public ocaml5.0-merlin-lib + (package-with-ocaml5.0 ocaml-merlin-lib-500)) + (define-public ocaml-dot-merlin-reader (package (inherit ocaml-merlin-lib) From patchwork Fri Dec 16 13:25:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45371 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 2B01427BBED; Fri, 16 Dec 2022 13:27:58 +0000 (GMT) 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 8BF9127BBE9 for ; Fri, 16 Dec 2022 13:27:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Ajz-0006Wo-HC; Fri, 16 Dec 2022 08:27:07 -0500 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 1p6Ajx-0006S3-6P for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Ajw-0007W0-Sq for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Ajw-00039x-NT for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 27/28] gnu: Add ocaml5.0-dot-merlin-reader. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:27:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119719612056 (code B ref 60120); Fri, 16 Dec 2022 13:27:04 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:36 +0000 Received: from localhost ([127.0.0.1]:49358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6AjU-00038I-7v for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:36 -0500 Received: from mout01.posteo.de ([185.67.36.65]:48325) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aj1-00033J-6J for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:07 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id A648424002D for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:26:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197161; bh=y1xVjPxIE3Fo1K2vfdsjjOZBLRBsZ5CqSRAD4RmgtTo=; h=From:To:Cc:Subject:Date:From; b=o5i9vZferU9q4SpRR4Gd3xarSzY7xzK1BzLpP+cm4A2qCzMmC6ZHCzocrWdAaoL+S RYHBSshtAaWnOyx7CdCGwPQO2Fp9xmMzjHm+6rHUDfQz5Y8McZsXwOEyMqSeyU8THn ZLmOGJuQUFeuJQtI9Wrc7M8p3vtIiKQGB7B7TSzEK8IsFuZNlm6ZpTHQ/0NQxw2+q1 kDAvsChQRnGzmqWlR7Kth47+xDWb5DZaNNwcAmG1B+2BeTeaYoyukPRmiu4nLxXYlG +dniJYT+YREmi8R3xbs6F5OiLjvOECj/RGV+uA8EB4q80ZA4H4TLryK6gDNUAUoJVA uDy4nxSbApw/w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGx1kLCz6tm4; Fri, 16 Dec 2022 14:26:01 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:26 +0000 Message-Id: <20221216132527.2539-27-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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 (ocaml5.0-dot-merlin-reader): New variable. --- gnu/packages/ocaml.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1b3e51001f..dc824626fd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5405,10 +5405,23 @@ (define-public ocaml-dot-merlin-reader (arguments '(#:package "dot-merlin-reader" #:tests? #f)) ; no tests (propagated-inputs (list ocaml-merlin-lib)) + (properties `((ocaml5.0-variant . ,(delay ocaml5.0-dot-merlin-reader)))) (synopsis "Reads config files for @code{ocaml-merlin}") (description "@code{ocaml-dot-merlin-reader} is an external reader for @code{ocaml-merlin} configurations."))) +(define-public ocaml5.0-dot-merlin-reader + (package-with-ocaml5.0 + (package + (inherit ocaml-merlin-lib-500) + (name "ocaml-dot-merlin-reader") + (arguments '(#:package "dot-merlin-reader" + #:tests? #f)) ; no tests + (propagated-inputs (list ocaml5.0-merlin-lib)) + (synopsis "Reads config files for @code{ocaml-merlin}") + (description "@code{ocaml-dot-merlin-reader} is an external reader for +@code{ocaml-merlin} configurations.")))) + (define-public ocaml-merlin (package (inherit ocaml-dot-merlin-reader) From patchwork Fri Dec 16 13:25:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45364 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 853F827BBE9; Fri, 16 Dec 2022 13:27:23 +0000 (GMT) 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 6226927BBEB for ; Fri, 16 Dec 2022 13:27:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Ajz-0006Wa-8a; Fri, 16 Dec 2022 08:27:07 -0500 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 1p6Ajx-0006Sj-G9 for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Ajx-0007WB-7L for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Ajx-0003A4-2p for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 28/28] gnu: Add ocaml5.0-merlin. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:27:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119719712063 (code B ref 60120); Fri, 16 Dec 2022 13:27:05 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:37 +0000 Received: from localhost ([127.0.0.1]:49360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6AjU-00038P-IA for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:36 -0500 Received: from mout01.posteo.de ([185.67.36.65]:56801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aj2-00033m-GI for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:09 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 0132E240029 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:26:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197163; bh=VSQsJQyQ3+Bn6XXCFe+Ypqzn4O5AK0UDRtR4hug76yQ=; h=From:To:Cc:Subject:Date:From; b=Kbw0OO/F2n09xP5td/hrQLqql3nqBJC0hTNUCzVfTioFwT/M+BhZ2TYUNaIUO5wNH IV8v0FleT+ZJtr/kFQxsYHi/cXQPAHsdfv2QBv7BQvOLWeQt7TZZ6sX+Ku6fsSNq7z HY5GP5cCz7kSJVXKMbodX/QacrYmsEdZQ3e3hohDuhYiekv2sO36glWO9W8USzbj6Y bkqR8y0r1YXv8mke9u0U4Pg7bYXJy/21QFYjqqtsUkSWuig+nNlv1pmVD5OSHfOVsV eEa1vYd0VwmyZGZ/cOvlebPzlHoUua1dUEX7w4IGtHQSO9KCGoIUUWaWgob5Xm7B6E 8bcF9ruZA0VAg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGy4KNqz6tm4; Fri, 16 Dec 2022 14:26:02 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:27 +0000 Message-Id: <20221216132527.2539-28-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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: , 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 (ocaml5.0-merlin): New variable. --- gnu/packages/ocaml.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index dc824626fd..1e4fb46645 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5435,6 +5435,7 @@ (define-public ocaml-merlin (when tests? (invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader"))))))) (propagated-inputs (list ocaml-merlin-lib ocaml-yojson)) + (properties `((ocaml5.0-variant . ,(delay ocaml5.0-merlin)))) (native-inputs (list ocaml-dot-merlin-reader ; required for tests ocaml-ppxlib @@ -5447,6 +5448,32 @@ (define-public ocaml-merlin Atom.") (license license:expat))) +(define-public ocaml5.0-merlin + (package-with-ocaml5.0 + (package + (inherit ocaml-merlin-lib-500) + (name "ocaml-merlin") + (arguments + '(#:package "merlin" + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader"))))))) + (propagated-inputs (list ocaml-merlin-lib ocaml-yojson)) + (native-inputs + (list ocaml-dot-merlin-reader ; required for tests + ocaml-ppxlib + ocaml-mdx + jq)) + (synopsis "Context sensitive completion for OCaml in Vim and Emacs") + (description "Merlin is an editor service that provides modern IDE +features for OCaml. Emacs and Vim support is provided out-of-the-box. +External contributors added support for Visual Studio Code, Sublime Text and +Atom.") + (license license:expat)))) + (define-public ocaml-gsl (package (name "ocaml-gsl")