From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ILhvMP3cAmJi8wAAgWs5BA (envelope-from ) for ; Tue, 08 Feb 2022 22:13:33 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id UCnWLf3cAmLJUAAA9RJhRA (envelope-from ) for ; Tue, 08 Feb 2022 22:13:33 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 646D52A6E6 for ; Tue, 8 Feb 2022 22:13:33 +0100 (CET) Received: from localhost ([::1]:53278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXno-0004G8-Jt for larch@yhetil.org; Tue, 08 Feb 2022 16:13:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuE-0000dV-If for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54949) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuE-0007YO-94 for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuE-0002bA-5Y for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 11/24] gnu: Add ocaml-bin-prot. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Feb 2022 20:16:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53882 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53882@debbugs.gnu.org Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.16443513189750 (code B ref 53882); Tue, 08 Feb 2022 20:16:06 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:18 +0000 Received: from localhost ([127.0.0.1]:48810 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtR-0002X6-MI for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:18 -0500 Received: from lepiller.eu ([89.234.186.109]:47110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtH-0002Sz-PI for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:08 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 943161f6 for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=qoiiuPhzL1z+V04L/6Ej6PnJm kdAiI5HakU9FU6/O/E=; b=bA9m/l9gEygQjGso5VAvbL0HstYfMtvqI6jxBLCdB 6Wab4qE1YaFFC9l2Lq0I6O18Kk7JqPyhhN2Rt5PbniFNBHsroE729CHLtxBinwUS BfpPW1XzibGskzu7v7sRkA8TdUUZT10hv+Vo3kr+gWv/uPVeYJZ9LNl2cfhO1QMK 8RFRXj/dOBE6RAk6mAy9l1l743RrJQEnj1SG3lHXdzluYe0f77f9IOSP7W/prrfL cDSjNfyTqM4TyrBe+RZbYHadN9NB4bB0S4EdcP8vQX/iN4b9M+/IgnKg0NoZoQCq uZXE1/JxC+4xhvaAE6nhNGTLV+xaZdaM8sbTWTAgWPENA== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 82a84870 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:57 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:37 +0100 Message-Id: X-Mailer: git-send-email 2.34.0 In-Reply-To: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> References: <1dcef02fe1f5f25657c6427d09c43bfc41091050.1644350657.git.julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1644354813; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=8RLn2PYTrnjc71mMZN0ANcCHyLzsWSI+pOWf5Uivt8Y=; b=Hpo9XZYzBDB6Ru/by/iChujEvjyoGZtdik9KM59jNWu3hmnPUrm0IQuwfywRzUf6AaA8WN 8eJDUXuo6f7VMTbZaBM4NLc6Qdc8Tfg9wquH8pzkDJ+HYhzkbg/Mxxcl+pQil4SnPMY4X3 sGOCUFxCoOga0Ttvi7lVL9EulRD/hgxc5DWNx5ItzH4xPc8fJ24QBJ0YFp6+Ym5Mns0rRt KUqQoXLueXf5IGfqZwDTa3SUbkeOWqyHQhLxJJsTE2eNTFJsRwWbJzshJvA865PLdx4bIo a+o0KVI41T5qfKkGg+P7c6p5GlkWSpvLk6efNtxwy/f+bHqR2cEpOLPM4Xg9cQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644354813; a=rsa-sha256; cv=none; b=SWs2G3/hSltj8nlia5JL5B6FOtLbqhDiL0wdvz5AhLposAG3+qFhdfqu6RYgwc2iqT4wPn WOzPDgvudaZWWCy8xYDhHMpN+JFtQCZYdewy0SE4JNOtJdiJx9Af/KXT53VaM6WV1U0Uih GttNchYOw/VhMSfz0MX7NdsXWs5YdB50RTKt93HOicxCGE1Js/7ynDUCWHlZ2UKOZKlNQI EKXuxJ2RVppF2ILAjZngv9+B3s4GGGC+fvtHIeIBJ+T4YEOQ58+oL4a3KJw6RqhzVI+3Mh kMQQqzRj5nR3lpsIDTs4BJxVn91+DMoGkq0+96ijG1TZiXmmOt6LVRSglIBioQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b="bA9m/l9g"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -0.53 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b="bA9m/l9g"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 646D52A6E6 X-Spam-Score: -0.53 X-Migadu-Scanner: scn0.migadu.com X-TUID: /4z9CAzk57or * gnu/packages/ocaml.scm (ocaml-bin-prot): New variable. (ocaml4.07-bin-prot): Inherit from it. --- gnu/packages/ocaml.scm | 75 ++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b1d9b73b90..cc2b05266a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5582,33 +5582,30 @@ (define-public ocaml4.07-ppx-custom-printf "11b73smf3g3bpd9lg014pr4rx285nk9mnk6g6464ph51jv0sqzhj")) (properties `((upstream-name . "ppx_custom_printf")))))) -(define-public ocaml4.07-bin-prot +(define-public ocaml-bin-prot (package - (name "ocaml4.07-bin-prot") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/bin_prot-v" version ".tar.gz")) - (sha256 - (base32 - "1rsd91gx36prj4whi76nsiz1bzpgal9nzyw3pxdz1alv4ilk2il6")))) + (name "ocaml-bin-prot") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/bin_prot") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qyqbfp4zdc2jb87370cdgancisqffhf9x60zgh2m31kqik8annr")))) (build-system dune-build-system) - (inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) - ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-ppx-variants-conv" ,(package-with-ocaml4.07 ocaml-ppx-variants-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)))) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (properties `((upstream-name . "bin_prot"))) + (propagated-inputs + (list ocaml-base + ocaml-ppx-compare + ocaml-ppx-custom-printf + ocaml-ppx-fields-conv + ocaml-ppx-optcomp + ocaml-ppx-sexp-conv + ocaml-ppx-variants-conv)) + (properties `((upstream-name . "bin_prot") + (ocaml4.07-variant . ,(delay ocaml4.07-bin-prot)))) (home-page "https://github.com/janestreet/bin_prot") (synopsis "Binary protocol generator") (description "This library contains functionality for reading and writing @@ -5617,9 +5614,31 @@ (define-public ocaml4.07-bin-prot structured values at speeds sufficient to saturate a gigabit connection. The protocol is also heavily optimized for size, making it ideal for long-term storage of large amounts of data.") - (license (list - license:asl2.0 - license:bsd-3)))) + (license license:expat))) + +(define-public ocaml4.07-bin-prot + (package-with-ocaml4.07 + (package + (inherit ocaml-bin-prot) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/bin_prot-v" version ".tar.gz")) + (sha256 + (base32 + "1rsd91gx36prj4whi76nsiz1bzpgal9nzyw3pxdz1alv4ilk2il6")))) + (propagated-inputs (list ocaml-base + ocaml-ppx-compare + ocaml-ppx-custom-printf + ocaml-ppx-fields-conv + ocaml-ppx-variants-conv + ocaml-migrate-parsetree)) + (properties '()) + (license (list + license:asl2.0 + license:bsd-3))))) (define-public ocaml-octavius (package -- 2.34.0