From patchwork Tue Feb 8 20:14:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 168 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 F36F527BBEA; Tue, 8 Feb 2022 20:18:31 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 B46E927BBE9 for ; Tue, 8 Feb 2022 20:18:31 +0000 (GMT) Received: from localhost ([::1]:40734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHWwY-0002Uw-OP for patchwork@mira.cbaines.net; Tue, 08 Feb 2022 15:18:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHWuF-0000de-By for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54951) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHWuF-0007Yd-2U for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nHWuE-0002bP-VC for guix-patches@gnu.org; Tue, 08 Feb 2022 15:16:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH 13/24] gnu: Add ocaml-ppx-bench. 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.16443513199765 (code B ref 53882); Tue, 08 Feb 2022 20:16:06 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Feb 2022 20:15:19 +0000 Received: from localhost ([127.0.0.1]:48814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtS-0002XK-Gq for submit@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:18 -0500 Received: from lepiller.eu ([89.234.186.109]:47112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nHWtI-0002TE-9S for 53882@debbugs.gnu.org; Tue, 08 Feb 2022 15:15:09 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 651d433e 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=uylSKvMcDtWnUUQyF81J8ShBf EeZfbGguqRqI1xCHYg=; b=LAckuTFtnGRri8psKWNyakXIIA8rNELIWSpx0ognL tSTlkYW0oiMl0O46WtSBmqCxqI3vyfhG0n6GxmMc5yB0N2G6bU8GXCOIy8MX/j0Z aaAp99REUN7CU65SylE19pWeXF3d/nwjCOl5kG88eyCSb4EJywGvyA+qkzNH9ivv EarnATilDBcrM8EoVHE59Pvxri3MCuZqxNBKfnuOjjlJdhwEV7pYxH0uW/9gKlAK +YNjMzxAibzyHPE+FFYPMHE7mSRzS+bTRugYCj/RbFDEzgZSV2d+kcGr8fFD9w64 nGbO753BgTChaxM8EhJ5eO3fkr2Uo129vvhWShCZ/+Mew== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id a3b65d1e (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:39 +0100 Message-Id: <3a01e4d0f5ea613832347e709e4c02aad7e44476.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 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-bench): New variable. (ocaml4.07-ppx-bench): Inherit from it. --- gnu/packages/ocaml.scm | 57 ++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1fa229486d..8f8b4ca32f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5746,35 +5746,48 @@ (define-public ocaml4.07-ppx-enumerate "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr")))) (properties `((upstream-name . "ppx_enumerate")))))) -(define-public ocaml4.07-ppx-bench +(define-public ocaml-ppx-bench (package - (name "ocaml4.07-ppx-bench") - (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_bench-v" version ".tar.gz")) - (sha256 - (base32 - "0ys4pblbcjbk9dn073rqiwm7r6rc7fah03j7riklkwnb5n44andl")))) + (name "ocaml-ppx-bench") + (version "0.14.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/janestreet/ppx_bench") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12r7jgqgpb4i4cry3rgyl2nmxcscs5w7mmk06diz7i49r27p96im")))) (build-system dune-build-system) (arguments ;; No tests - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (propagated-inputs - `(("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_bench"))) + `(#:tests? #f)) + (propagated-inputs (list ocaml-ppx-inline-test ocaml-ppxlib)) + (properties `((upstream-name . "ppx_bench") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-bench)))) (home-page "https://github.com/janestreet/ppx_bench") (synopsis "Syntax extension for writing in-line benchmarks in ocaml code") (description "Syntax extension for writing in-line benchmarks in ocaml code.") - (license license:asl2.0))) + (license license:expat))) + +(define-public ocaml4.07-ppx-bench + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-bench) + (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_bench-v" version ".tar.gz")) + (sha256 + (base32 + "0ys4pblbcjbk9dn073rqiwm7r6rc7fah03j7riklkwnb5n44andl")))) + (propagated-inputs + (list ocaml-ppx-inline-test ocaml-migrate-parsetree ocaml-ppxlib)) + (properties '()) + (license license:asl2.0)))) (define-public ocaml-ppx-here (package