From patchwork Mon May 10 05:16:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 29209 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 DCA4B27BC82; Mon, 10 May 2021 06:19:01 +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 D2C9927BC81 for ; Mon, 10 May 2021 06:19:00 +0100 (BST) Received: from localhost ([::1]:38124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyJo-0002dA-0d for patchwork@mira.cbaines.net; Mon, 10 May 2021 01:19:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJ5-0008Lh-Pc for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45548) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ5-0003Zz-GN for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ5-0000Va-BH for guix-patches@gnu.org; Mon, 10 May 2021 01:18:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 22/43] gnu: Add ocaml-ppx-assert. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:15 +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: 47768@debbugs.gnu.org Cc: pukkamustard , divoplade , Maxime Devos Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.16206238801630 (code B ref 47768); Mon, 10 May 2021 05:18:15 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:00 +0000 Received: from localhost ([127.0.0.1]:57032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIq-0000Q8-8F for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:00 -0400 Received: from mout01.posteo.de ([185.67.36.65]:34967) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIQ-0000K7-Nv for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:36 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 379B3240027 for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623849; bh=W2eUhXrm4QJZPiU5YMNYPYsho5EjXGHrJ5qsHS/09mA=; h=From:To:Cc:Subject:Date:From; b=NyWo+F4QgPSGw+5zgqGL2Aoo/4wifqV+y4inHI7lrsv2u7Xu6NBLU2/VDMzTjYx1T IaTAyPErCjy8liH17P/O021zaSM5esX1hSS8ocerd7jVopUg71v1fDuCN6aRIx2xDK mqVQa/yWjAYSrN1fwx9VSzvEWSY6Fmx5qN80CBKTXRPjkVFY7vJyNXgQkq6D3sL149 1fTgLCo+R/BdYmFPwkFspGBCU8zSKOGm/+sBdS70LmiSNBgj+DD0YFltYixvbJfgZt 2X+p3M/6ms/WJedWP4Mhr1qSkPp5Hjacki0Ml1keko4DPW0CS8Zw9EigmZXgY972FQ U8+SE5OzMubbA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7D4jgBz9rxR; Mon, 10 May 2021 07:17:28 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:07 +0000 Message-Id: <20210510051628.15359-23-pukkamustard@posteo.net> In-Reply-To: <20210510051628.15359-1-pukkamustard@posteo.net> References: <20210414090800.6458-1-pukkamustard@posteo.net> <20210510051628.15359-1-pukkamustard@posteo.net> 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-assert): New variable. (ocaml4.07-ppx-assert): Inherit from ocaml-ppx-assert. --- gnu/packages/ocaml.scm | 63 ++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a27a1170ac..799bebeba9 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5647,38 +5647,47 @@ instruction cache on the hot path. See also https://github.com/ocaml/ocaml/issues/8563.") (license license:expat))) -(define-public ocaml4.07-ppx-assert +(define-public ocaml-ppx-assert (package - (name "ocaml4.07-ppx-assert") - (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_assert-v" version ".tar.gz")) - (sha256 - (base32 - "17kd311n0l9f72gblf9kv8i5rghr106w37x4f0m5qwh6nlgl0j9k")))) + (name "ocaml-ppx-assert") + (version "0.14.0") + (source + (janestreet-origin "ppx_assert" version + "1l2rr4jz2q5b35ryn2z146z7m9v6k8krp5gpn8ilib66mnz5zx15")) (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-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) - ("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_assert"))) + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-cold" ,ocaml-ppx-cold) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_assert") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-assert)))) (home-page "https://github.com/janestreet/ppx_assert") (synopsis "Assert-like extension nodes that raise useful errors on failure") (description "This package contains assert-like extension nodes that raise useful errors on failure.") (license license:asl2.0))) +(define-public ocaml4.07-ppx-assert + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-assert) + (version "0.11.0") + (source + (janestreet-origin "ppx_assert" version + "17kd311n0l9f72gblf9kv8i5rghr106w37x4f0m5qwh6nlgl0j9k")) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-ppx-compare" ,ocaml-ppx-compare) + ("ocaml-ppx-here" ,ocaml-ppx-here) + ("ocaml-ppx-sexp-conv" ,ocaml-ppx-sexp-conv) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_assert")))))) + (define-public ocaml4.07-ppx-expect (package (name "ocaml4.07-ppx-expect") @@ -5699,7 +5708,7 @@ useful errors on failure.") #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) + ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml4.07-ppx-assert)) ("ocaml-ppx-compare" ,(package-with-ocaml4.07 ocaml-ppx-compare)) ("ocaml-ppx-custom-printf" ,ocaml4.07-ppx-custom-printf) ("ocaml-ppx-fields-conv" ,ocaml4.07-ppx-fields-conv) @@ -5876,7 +5885,7 @@ functions from type definitions.") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) + `(("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) ("ocaml-ppx-bench" ,ocaml4.07-ppx-bench) ("ocaml-ppx-bin-prot" ,ocaml4.07-ppx-bin-prot) @@ -6072,7 +6081,7 @@ thousands of times faster than fork. `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) ("ocaml-configurator" ,ocaml4.07-configurator) ("ocaml-core-kernel" ,ocaml4.07-core-kernel) - ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) + ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-sexplib" ,(package-with-ocaml4.07 ocaml-sexplib)) ("ocaml-spawn" ,ocaml4.07-spawn) @@ -6114,7 +6123,7 @@ standard library that was developed by Jane Street.") ("ocaml-configurator" ,ocaml4.07-configurator) ("ocaml-fieldslib" ,ocaml4.07-fieldslib) ("ocaml-jane-street-headers" ,ocaml4.07-jane-street-headers) - ("ocaml-ppx-assert" ,ocaml4.07-ppx-assert) + ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,ocaml4.07-ppx-base) ("ocaml-ppx-hash" ,ocaml4.07-ppx-hash) ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test)