From patchwork Fri Apr 8 13:22:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38396 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 3B50927BBE9; Fri, 8 Apr 2022 14:25:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 A4F2027BBEA for ; Fri, 8 Apr 2022 14:25:46 +0100 (BST) Received: from localhost ([::1]:59542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncocT-0004Jx-QF for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:25:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoat-0002NW-4R for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40400) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoas-0001Qh-CA for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoas-0007tF-8n for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 12/25] gnu: Add ocaml-bin-prot. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24: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 Cc: Julien Lepiller Received: via spool by 53882-submit@debbugs.gnu.org id=B53882.164942422930137 (code B ref 53882); Fri, 08 Apr 2022 13:24:06 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:49 +0000 Received: from localhost ([127.0.0.1]:34260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaa-0007pv-I9 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:48 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:37603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaO-0007m3-O6 for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:37 -0400 Received: by mail-wr1-f45.google.com with SMTP id z1so12837077wrg.4 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dB91o/yMhIHd22oFn8cYthbo0LDD4SS3RPwLKcg3qUQ=; b=lvF22GKs+q5gnsVcEdL1nyIzCSJ2OY8igKeqWVAHDpcHHT73p46+UUiR5iVzHE0M0G dBleQcQq1MNSlvIDzlttgkVQmzaelTVb02VFp2dvl8gBHo+TorunuCTFyBwMhYej33Ci 6tS6TDYBInnJf8JTQSUDqMBZ3iU6aBqcNZ0+KbbL1tOJrKnA8DzpYkJp3f2e//j3vqbX eqEmCgyNdwiH2CygmZmBbfrPfWIaQCPW2tSRktVEywWQg0eYaDTHx1MrHShwmF8OhW6T oCDJP+8oxTBvw1zpJNDo+P8CmF9z9RFuJAkLirktYHofH8lMcv8yXPVJxtDIDbWr6ylS vtvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dB91o/yMhIHd22oFn8cYthbo0LDD4SS3RPwLKcg3qUQ=; b=guCbqZAsvpHv4csCeYqmoIcWg0U90ZF4PK6IwHMRn1P+KduZ4HcebZoLFwLBDsoUkd HQ7I2gvsVL6pSddX04O2uLlcMLidBv70Qz4mpDVZcN5g6vBvcSjhUltw/HmRH1iwUWKq PcWcRKP3G7kIcHEDCM0jp8lkjoJ121yPx3tJ5gp46GWGqvv+RsfYufoOQVJH/h7RX5CS RoDcI2pHfrmgo92wAloZCv9Af/p4FsCElXp0n8/8GyaY302dMVjdve3k1EtPmkebAvWl bNwEuMVIJR7aFIOa1EK5nx5OR8XgoRvYwRXOHN5C/qBxE+RiHtRT4Ww8IuZR51NFFCsN oiMg== X-Gm-Message-State: AOAM531zqDjaGEbSb97RcUEZ152lXbG7XFRa6gIgUMVuFe33JqDDodxA qYJznzR16ox29EppZOx3TFlM74D2eKo= X-Google-Smtp-Source: ABdhPJyg3tDP89UaOtq/rr0RlIYOW8VwmzJ1G/BiHOG2HdBq3zdwmQ1x+E+pZY1NGJgWjR7wIgNMmA== X-Received: by 2002:adf:bc0d:0:b0:206:14a6:817f with SMTP id s13-20020adfbc0d000000b0020614a6817fmr14835585wrg.136.1649424211096; Fri, 08 Apr 2022 06:23:31 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z3-20020a1cf403000000b0037d1f4a2201sm10108954wma.21.2022.04.08.06.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:30 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:52 +0200 Message-Id: <20220408132305.3301350-12-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220408132305.3301350-1-zimon.toutoune@gmail.com> References: <20220408132305.3301350-1-zimon.toutoune@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches From: Julien Lepiller * 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 67902f58b3..fbe07fbb21 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5580,33 +5580,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 @@ -5615,9 +5612,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