From patchwork Fri Apr 8 13:22:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38407 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 D1CAC27BBE9; Fri, 8 Apr 2022 14:27:10 +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 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 1761C27BBEA for ; Fri, 8 Apr 2022 14:27:10 +0100 (BST) Received: from localhost ([::1]:35998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncodp-0007Z7-8H for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:27:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoat-0002NX-7A for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40401) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoas-0001Qj-Po 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-0007tN-Ko for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 13/25] gnu: Add ocaml-ppx-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.164942422930144 (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]:34262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoab-0007q2-04 for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:49 -0400 Received: from mail-wm1-f49.google.com ([209.85.128.49]:43873) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaP-0007m5-3Q for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:38 -0400 Received: by mail-wm1-f49.google.com with SMTP id m67-20020a1ca346000000b0038e6a1b218aso5552589wme.2 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:37 -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=tc4+nvws21rYmo9rGHp397Id9+YFKbxzZR5cwvia4Po=; b=mlPA06sFwLX0ELVmX60zKCbOm7MaBrRV0sl3VAdGWAnsyqRcORvseuu5xneC9wogO7 8f5wqG2K4XEDPDM0F71qBJGwpLVoWnzG1mNjtH72P1O6jRY44g4+eZZ9SN+VwpB/9odx iRmSFNWJsWQVveAIEX6HGud3VeY2mpX62S7l3BnpB5d+EWFYAWHFEbNjTkyprLgex6+T L15ppsLb5BKB0wavf2tT+ExUG4jUX92JOb1UrsbnmmMOx4bJTrO5lv+aTSHgvIxzW42Z deX6UzyfbD28b0ernyD1otI35H68kqAosKY2WGGaI2cgMw4wWAaei809KPff6M0CnfoP 6sow== 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=tc4+nvws21rYmo9rGHp397Id9+YFKbxzZR5cwvia4Po=; b=l7+UYe37SiJge+D3EFzytzW7G3XfGbU/YDlZTuQubTPtRIIXBOiuOnCLmTIcCVmMYo xeywyVvwgsicTZSnrH21IPaBWE8U3585gUzy3TyynZkpcW96GRvXYAJnmOcEL9PpXyHd 7ylthhRKIfi00ngYpinsRsL15wZ+Vns9YM0xn3laL3bIWdgWsGP038Sc34FhLw1OSjPg zNiy/kyI3QHW/vbLWB2Go1yxwU6shajTC2xV6FeI0AX3q/3MT2492xe1zC7yssnUtCm3 1NdM3FjH0t8OgXZIWYVkoSXw7y/ehk1YyvCmBMjpbaCwUIFGFqIaMfzoEUFtKwKbIDKl A9WA== X-Gm-Message-State: AOAM530QHbfkzG//mk8zaWzjpp0e9uaTX+gbGkW5mFIZPBjYO8CWOHYv GXz2P0Xvlk0Q9CT5d4U05JZHW1I4uL4= X-Google-Smtp-Source: ABdhPJxGeyBSaEz3CmStbxdwqQjqkzVvVFDnr4bQCCvehzME8lxKx0L2mF5zXigXGTkuoEELIoxtZA== X-Received: by 2002:a1c:218b:0:b0:38e:aa07:62a8 with SMTP id h133-20020a1c218b000000b0038eaa0762a8mr1630833wmh.172.1649424211576; 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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:31 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:53 +0200 Message-Id: <20220408132305.3301350-13-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-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 fbe07fbb21..14e945df56 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