From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 yGuOBgLdAmIjCgEAgWs5BA (envelope-from ) for ; Tue, 08 Feb 2022 22:13:38 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 8HbROgHdAmLclQAAG6o9tA (envelope-from ) for ; Tue, 08 Feb 2022 22:13:37 +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 B2ACF2A932 for ; Tue, 8 Feb 2022 22:13:37 +0100 (CET) Received: from localhost ([::1]:54150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHXns-0004sY-Sf for larch@yhetil.org; Tue, 08 Feb 2022 16:13:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuE-0000dW-Uk for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54950) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuE-0007YV-LI 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-0002bH-IK for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 12/24] gnu: Add ocaml-ppx-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.16443513189757 (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]:48812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtS-0002XD-4H for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:18 -0500 Received: from lepiller.eu ([89.234.186.109]:47114) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtI-0002UV-7K 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 a54fc547 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=lDAyUkxGrbYOQqySma1JhTB2w gVg3R8me01rZX1oUuo=; b=XRob1iInjg1dscptznWLvjZ3DV73bTBeU8FIqwx9L 3EZ3+QVnl0zIxVdHKdXV2E5TYfpVcIt0TPbartlOBeQQbxNq8u/pDllJ4PSmnEG9 3mssDaRJuCAvQdbNIaeP3W7xiBepPkTXu89lDi5W7eoxVRcIR+mt7cD5GBNjQqUS JCiZ3VZvoJrdv8EJYKI76D1cHRRsKG4iWC1rrp1eWu+Hl7Fe69ff1ZqlrcyKtDt3 81p8gHDp8Uu7BHHlxj3Qg7s46sW0QUCBuTjtzoeRq9/+Oa77tNINWD2U918AqCvp EPNhfD6maPKuAZHGqSCGHVS+z0PBmajGZohI/QGFy6F8g== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 24d59b42 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <53882@debbugs.gnu.org>; Tue, 8 Feb 2022 20:14:58 +0000 (UTC) From: Julien Lepiller Date: Tue, 8 Feb 2022 21:14:38 +0100 Message-Id: <39cb1fe9d5b089a9bfad82f1ce032b0064f84ee3.1644350657.git.julien@lepiller.eu> 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=1644354817; 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=QSOaEhZNHdk7mNnP4pqKtrsx7SjwB+Quy6QJAGjXufY=; b=GsggNm2yCtbu/S/qaMEEKCdKuuhRdf2O7n4bmAZFfYCx4uqd6QQthD2RlNG8nJSoIRwGZ8 CQvTRfGdLhxVu8M3swxghKnyLoi6Nnz5GaMDp7Lt+YfOmvDQnxlnsX60wNtrAw2hIzOsgf TrzS6miFdQHzCMCTYcJFEDs3I8VyYSon5wTse9WlpOsnOT+CYY3LIoi1gTbr19zI7/o8Q8 Xl2Dg3veXq0/V/f9xV1e4/9cyLUmDJxX4zgCg/Fi1/luG9Dz5rSzdXQuLc8d1Q6BgRjTs5 GDGdOWV7PuvVVzhwO2PMhify8qUNaRsTrdUmcyk9O6XVAbGqeMjezDfTCokQfA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644354817; a=rsa-sha256; cv=none; b=XeNi6tkt/kRsvWDeJMuTsI/67LWFrcTXkfHe3BHfsLg32Rhvj4fmWFCvJIkAGt/geoV0Ks 9H+jXjFHTFYjuxYQNVjuyzITPnY7r3Qv1SQ/8D6N3aScb9x2UOwiVd3Zofs5NeVbshTbpS uVFcKKgcnTtEtnxJIsYKhFD0QaSYX3AZvcjs2uzb68fat55CB8j/J5p2MW99DPMGPmkzWq kJPxygLmj8mfmmHTNNnziZN9GBwViH7FacFE8Qy0/TFuOYjuQhowGr0zSE4oXJBzpkGstg SR4Qjwvy1c0F/yJrWpuCQXJU1ST8SwmH/T94ur03DtNA7hcyW76IvppGB4yjyw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=XRob1iIn; 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=XRob1iIn; 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: B2ACF2A932 X-Spam-Score: -0.53 X-Migadu-Scanner: scn1.migadu.com X-TUID: mfkZ5vEEVlRc * gnu/packages/ocaml.scm (ocaml-ppx-bin-prot): New variable. (ocaml4.07-ppx-bin-prot): Inherit from it. --- gnu/packages/ocaml.scm | 64 ++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index cc2b05266a..1fa229486d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6423,39 +6423,55 @@ (define-public ocaml4.07-ppx-base ("ocaml-ppxlib" ,ocaml-ppxlib))) (properties `((upstream-name . "ppx_base")))))) -(define-public ocaml4.07-ppx-bin-prot +(define-public ocaml-ppx-bin-prot (package - (name "ocaml4.07-ppx-bin-prot") - (version "0.11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/janestreet/ppx_bin_prot") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1h60i75bzvhna1axyn662gyrzhh441l79vl142d235i5x31dmnkz")))) + (name "ocaml-ppx-bin-prot") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_bin_prot") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qryjxhyz3kn5jz5wm62j59lhjhd1mp7nbsj0np9qnbpapnnr1zg")))) (build-system dune-build-system) (arguments ;; Cyclic dependency with ocaml-ppx-jane - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(#:tests? #f)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-bin-prot" ,ocaml4.07-bin-prot) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_bin_prot"))) + (list ocaml-base ocaml-bin-prot ocaml-ppx-here ocaml-ppxlib)) + (properties `((upstream-name . "ppx_bin_prot") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-bin-prot)))) (home-page "https://github.com/janestreet/ppx_bin_prot") (synopsis "Generation of bin_prot readers and writers from types") (description "Generation of binary serialization and deserialization functions from type definitions.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-bin-prot + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-bin-prot) + (version "0.11.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_bin_prot") + (commit (string-append "v" version)))) + (file-name (git-file-name "ocaml4.07-ppx-bin-prot" version)) + (sha256 + (base32 + "1h60i75bzvhna1axyn662gyrzhh441l79vl142d235i5x31dmnkz")))) + (propagated-inputs + (list ocaml-base + ocaml-bin-prot + ocaml-ppx-here + ocaml-migrate-parsetree + ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml4.07-ppx-jane (package -- 2.34.0