From patchwork Fri Apr 8 13:22:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 38392 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 B8A2E27BBEA; Fri, 8 Apr 2022 14:24:57 +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 4572B27BBE9 for ; Fri, 8 Apr 2022 14:24:57 +0100 (BST) Received: from localhost ([::1]:57768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncobg-00039n-CG for patchwork@mira.cbaines.net; Fri, 08 Apr 2022 09:24:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncoat-0002NZ-DR for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40402) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ncoat-0001Qv-5F 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-0007tU-2O for guix-patches@gnu.org; Fri, 08 Apr 2022 09:24:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#53882] [PATCH v2 14/25] gnu: Add ocaml-ppx-bench. 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.164942422930152 (code B ref 53882); Fri, 08 Apr 2022 13:24:07 +0000 Received: (at 53882) by debbugs.gnu.org; 8 Apr 2022 13:23:49 +0000 Received: from localhost ([127.0.0.1]:34264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoab-0007q9-DM for submit@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:49 -0400 Received: from mail-wm1-f54.google.com ([209.85.128.54]:39790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ncoaP-0007m6-LH for 53882@debbugs.gnu.org; Fri, 08 Apr 2022 09:23:38 -0400 Received: by mail-wm1-f54.google.com with SMTP id bi13-20020a05600c3d8d00b0038c2c33d8f3so7546843wmb.4 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=9CqO0qMWTGWBbrCNLxMwBhRF8l41mLpiCKCxYHT8/7w=; b=M6N0d7JaKFa8KiQcf9Uy0B5gtPn8VSjXAclh8MPRtm6ZEBhff5sQjnFFCaWGkFg9Dc NQG5XQwz1iHBxAhhEJEWBo5TtC9JzH2TAXfRTc/f3JSgtHfOEYWA6yrYjSOWKBwWs6xn kIEz/nbqonlEiGKjmX+fYFVS6NFC96rh5j8wcePSYqdt0u3WExuv0OGqNarP0uRGajWF N2Sio2N83pANaPfy9OC3mT6hVcksILVWN02LPZJfIhh9d2agVTSebaAbSP+6Dk7PzdIy fT3ZaheikwWV0diFPZaDE4mIY7Gg84jOOV3Und+KPdTyHdNz9PJOYZ6kEMc3Rq7R6o4R TDYA== 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=9CqO0qMWTGWBbrCNLxMwBhRF8l41mLpiCKCxYHT8/7w=; b=v5HqoV4LpTia7Ge1keu2/rm5tCwHNE2K9LebPeFwfOjLmcqYTXYhcXQhyIZ1fUy36c oGzs+n0I+NckrYntjxYYkKOCxxC1WmlQe6ZS1lZGuFxcum8M1apoJJOrFOJjDQ5wm0MM i8u7N7yxv07EzJXfEWIfUcBr6LPqCW4Y1Will5mStqgbRrpW9ruJTulM2OryCsylAZlo qb5f88yPygVfBge2zFpZcHAPhBVaOzrl7yPph/TC1uPBEd3JYPGmf0WkPDUl5Lm4A4Te WrMuYN81nAtvPhij5C2J185xbSaHjAjKkh6zILGGmV286YG0W9frl2BUTkaQUmhx6f/h VzYg== X-Gm-Message-State: AOAM531HSS+TMIZ3/gGBwZEKpM3mPB+livEWXE6oIheee5XiKWHedcW+ s6g5eYIw3hZS0wpyiV0VIuZ5WyfSUIE= X-Google-Smtp-Source: ABdhPJzj/jCWBEjE1h8/7P0zCbbkRUgXMc6bVlAjAEOQQB+gcvP+dj69BxwdnTkxpqVecTnbqzWJVw== X-Received: by 2002:a7b:cf23:0:b0:38e:7df5:b492 with SMTP id m3-20020a7bcf23000000b0038e7df5b492mr17171671wmg.49.1649424211997; 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:54 +0200 Message-Id: <20220408132305.3301350-14-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-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 14e945df56..baa269c8ce 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5744,35 +5744,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