From patchwork Fri Apr 8 13:22:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38411 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 3541127BBE9; Fri, 8 Apr 2022 14:27:25 +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 B58AB27BBEA for ; Fri, 8 Apr 2022 14:27:24 +0100 (BST) Received: from localhost ([::1]:37278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncoe3-0008Pg-TJ for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:27:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoat-0002Nb-W2 for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40403) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoat-0001R1-Hx for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ncoat-0007tc-EY for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 16/25] gnu: Add ocaml-ppx-sexp-message. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Apr 2022 13:24:07 +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.164942423030159 (code B ref 53882); Fri, 08 Apr 2022 13:24:07 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:50 +0000 Received: from localhost ([127.0.0.1]:34266 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoab-0007qH-Ql for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:50 -0400 Received: from mail-wr1-f54.google.com ([209.85.221.54]:41802) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaQ-0007mF-Di for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:39 -0400 Received: by mail-wr1-f54.google.com with SMTP id k23so12818580wrd.8 for <53882@debbugs.gnu.org>; Fri, 08 Apr 2022 06:23:38 -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=xq7lqdfwOg1CSLhfmg5mb5EzYvpYtmj69a+diYN9ylA=; b=Ubj8pLPAcEDfOPhkK7zvuuMuzt19jS60JbkRtG/tnqTGo/t8GWyf1HhIKCpmydPx+t QsYh52T0C67RFMNH5I/jf+dbVgvigf3Ut68E4VqtngAvnqpVDiUq2YOpymLQ2WKlvlKQ slyErskEdUmJtT78kuzASBCv5Op6m/nfGyiawr9DAf1fi5nNS+NjK8+MTLA42X0Ng8yX kqiVSU8Li6eXdUOPOOs015/FGfkjVy+PUOPgDg04LzGRFrkavUu8qhHD6qNSRPB055qG kYXLDJqNZ2I+YYfjDlAMA8YlxMlDPWJ/CsRd6qJPHZZoU53uRcmlury93YdfMC07TLqs 9LXg== 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=xq7lqdfwOg1CSLhfmg5mb5EzYvpYtmj69a+diYN9ylA=; b=JI3IPh6m/4FJD8Io8CwyHre8XXmchH7jwoHJUV7GIgSi/4fjNq9UX8KNTMxpQCS0va Mo94sjs0yoE7C/+2BpXO7VWGXlIkrRbBjb0VIxqbsfOqN3P3MYelXUw6uorilXGzZb4/ C97rv+z4g3xYwot8Hsf4dIMbvFKaQwVI5qm7GcUC2/lzzlGQyE1/VwyIvY8Rgkn+owgk /EufWRkwthT9IWxfZItC4R1WeXV2FH1ZwtX4wIPUYIvhFGoSAKocAsWAMh7jqdn4cIpL LKk8lvmcMomFKBCsKfIMrTiYTykaB+8IrQVIvP8VH7LvVmC5vE1B6q6TJD/9kFe6DXxO p8TA== X-Gm-Message-State: AOAM532nvrETZ/vdgenvvq8XFVU3UgYdrRuzRDqONBu1hP4X1EKguyrD LSpR9IrseBX1vvkyLBUssApoYjQzwfM= X-Google-Smtp-Source: ABdhPJyQfTOC6qlmu2un2ck4bApVGIhKyWQ6Oh/KycIQ+hcMadbffPHgm5I+TebXyd4o9oBrliFZzw== X-Received: by 2002:a05:6000:1848:b0:204:e90:cb55 with SMTP id c8-20020a056000184800b002040e90cb55mr14731985wri.58.1649424212902; Fri, 08 Apr 2022 06:23:32 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Apr 2022 06:23:32 -0700 (PDT) From: zimoun Date: Fri, 8 Apr 2022 15:22:56 +0200 Message-Id: <20220408132305.3301350-16-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-sexp-message): New variable. (ocaml4.07-ppx-sexp-message): Inherit from it. --- gnu/packages/ocaml.scm | 61 ++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ab97ee27d6..942bcab4ad 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5902,38 +5902,53 @@ (define-public ocaml4.07-ppx-sexp-value (properties '()) (license license:asl2.0)))) -(define-public ocaml4.07-ppx-sexp-message +(define-public ocaml-ppx-sexp-message (package - (name "ocaml4.07-ppx-sexp-message") - (version "0.11.0") - (source (origin - (method url-fetch) - (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" - (version-major+minor version) - "/files/ppx_sexp_message-v" version ".tar.gz")) - (sha256 - (base32 - "1yh440za0w9cvrbxbmqacir8715kdaw6sw24ys9xj80av9nqpiw7")))) + (name "ocaml-ppx-sexp-message") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_sexp_message") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lvsr0d68kakih1ll33hy6dxbjkly6lmky4q6z0h0hrcbd6z48k4")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_sexp_message"))) + (list ocaml-base ocaml-ppx-here ocaml-ppx-sexp-conv ocaml-ppxlib)) + (properties `((upstream-name . "ppx_sexp_message") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-sexp-message)))) (home-page "https://github.com/janestreet/ppx_sexp_message") (synopsis "Ppx rewriter for easy construction of s-expressions") (description "Ppx_sexp_message aims to ease the creation of s-expressions in OCaml. This is mainly motivated by writing error and debugging messages, where one needs to construct a s-expression based on various element of the context such as function arguments.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-sexp-message + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-sexp-message) + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (string-append "https://ocaml.janestreet.com/ocaml-core/v" + (version-major+minor version) + "/files/ppx_sexp_message-v" version ".tar.gz")) + (sha256 + (base32 + "1yh440za0w9cvrbxbmqacir8715kdaw6sw24ys9xj80av9nqpiw7")))) + (propagated-inputs + (list ocaml-base + ocaml-ppx-here + ocaml-ppx-sexp-conv + ocaml-migrate-parsetree + ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-ppx-pipebang (package