From patchwork Tue Jun 1 20:22:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29764 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 45F1F27BC78; Tue, 1 Jun 2021 21:26:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 30F3527BC83 for ; Tue, 1 Jun 2021 21:26:15 +0100 (BST) Received: from localhost ([::1]:59528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1loAxq-0002Y5-4d for patchwork@mira.cbaines.net; Tue, 01 Jun 2021 16:26:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1loAwn-0007yU-Me for guix-patches@gnu.org; Tue, 01 Jun 2021 16:25:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54554) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1loAwn-0000Cf-05 for guix-patches@gnu.org; Tue, 01 Jun 2021 16:25:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1loAwm-0006uT-T8 for guix-patches@gnu.org; Tue, 01 Jun 2021 16:25:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v3 16/42] gnu: Add ocaml-ppx-let. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Jun 2021 20:25:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Xinglu Chen Cc: pukkamustard , 47768@debbugs.gnu.org Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.162257909826379 (code B ref 47768); Tue, 01 Jun 2021 20:25:08 +0000 Received: (at 47768) by debbugs.gnu.org; 1 Jun 2021 20:24:58 +0000 Received: from localhost ([127.0.0.1]:37837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwb-0006rP-Qu for submit@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:58 -0400 Received: from mout01.posteo.de ([185.67.36.65]:45859) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1loAwa-0006qk-Cm for 47768@debbugs.gnu.org; Tue, 01 Jun 2021 16:24:56 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id D616A24002A for <47768@debbugs.gnu.org>; Tue, 1 Jun 2021 22:24:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1622579090; bh=Of5mqDSoCf0L16oGhx1K5zKfK2tpt+lBrqisAYHJizU=; h=From:To:Cc:Subject:Date:From; b=iQKnvoGioZ0VIooqY3Ghhm5WX37lt+2nqxRHD2Apk18DnBs3GZK/q1RGFWvuT7eui Y14E7g/utc13qxLSE80r0xCYIxjcgCMmhZZoF8wO3y7Gf0nduTOo6B32SMMYkp+Ssx 5o0YvkVbbqcGOfhUxwTbRQUOGzZmHPUsxofqiYJyC3fuOKD1C+SNi1xF50ZSgco9Yq nO7sjAUS6U4Zof9J4BbYOPOxZxWKLxAc2xH04G5NH2xdwdykWbjFsbqr2KCnFXfaRM VbBR3syvqLN17MhbXG2voJQwG8tkQtDrfpa9Wg7uUWQ95U6Iotpf0sLsuFWLPxh/3v 6TAaH3vjqoqLg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FvkD05yWMz9rxF; Tue, 1 Jun 2021 22:24:48 +0200 (CEST) From: pukkamustard Date: Tue, 1 Jun 2021 20:22:59 +0000 Message-Id: <20210601202325.8777-17-pukkamustard@posteo.net> In-Reply-To: <87lf82hasx.fsf@yoctocell.xyz> References: <87lf82hasx.fsf@yoctocell.xyz> 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 * gnu/packages/ocaml.scm (ocaml-ppx-let): New variable. (ocaml4.07-ppx-let): Inherit from ocaml-ppx-let. --- gnu/packages/ocaml.scm | 44 ++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a2a3a78ea7..e6877e4e87 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5563,35 +5563,37 @@ used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, ...") (license license:asl2.0))) -(define-public ocaml4.07-ppx-let +(define-public ocaml-ppx-let (package - (name "ocaml4.07-ppx-let") - (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_let-v" version ".tar.gz")) - (sha256 - (base32 - "1wdfw6w4xbg97a35yg6bif9gggxniy9ddnrjfw1a0inkl2yamxkj")))) + (name "ocaml-ppx-let") + (version "0.14.0") + (source + (janestreet-origin "ppx_let" version + "1qcrnd86pbr1di5m6z4ps4p15qawwa02jxwz3xfd82hdbjmdwf1s")) (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-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_let"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_let") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-let)))) (home-page "https://github.com/janestreet/ppx_let") (synopsis "Monadic let-bindings") (description "A ppx rewriter for monadic and applicative let bindings, match expressions, and if expressions.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-let + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-let) + (version "0.11.0") + (source + (janestreet-origin "ppx_let" version + "1wdfw6w4xbg97a35yg6bif9gggxniy9ddnrjfw1a0inkl2yamxkj")) + + (properties `(upstream-name . "ppx_let"))))) + (define-public ocaml4.07-ppx-fail (package (name "ocaml4.07-ppx-fail") @@ -5861,7 +5863,7 @@ functions from type definitions.") ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) ("ocaml-ppx-here" ,ocaml4.07-ppx-here) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) - ("ocaml-ppx-let" ,ocaml4.07-ppx-let) + ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,ocaml4.07-ppx-optcomp) ("ocaml-ppx-optional" ,ocaml4.07-ppx-optional) ("ocaml-ppx-pipebang" ,ocaml4.07-ppx-pipebang)