From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KRv/LfG5dmBREgAAgWs5BA (envelope-from ) for ; Wed, 14 Apr 2021 11:46:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sIzYJvG5dmDMMAAAB5/wlQ (envelope-from ) for ; Wed, 14 Apr 2021 09:46:25 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 42F0C23916 for ; Wed, 14 Apr 2021 11:15:55 +0200 (CEST) Received: from localhost ([::1]:41944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbcm-0007Wy-Kd for larch@yhetil.org; Wed, 14 Apr 2021 05:15:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbbD-0005hM-Us for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50239) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbbA-0002AG-9f for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbbA-0007GA-53 for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 22/37] gnu: Add ocaml-ppx-assert. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14:12 +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 Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839163827627 (code B ref 47768); Wed, 14 Apr 2021 09:14:12 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:58 +0000 Received: from localhost ([127.0.0.1]:33503 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbav-0007BQ-Sp for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:58 -0400 Received: from mout02.posteo.de ([185.67.36.66]:41587) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaX-00076x-Nc for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id AFFFF240102 for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391607; bh=JHOvSfU7wehtfXXbwuc0Tl6ExDrIBJrmT3qIEgC7zUQ=; h=From:To:Cc:Subject:Date:From; b=L2eFR4NpvChVQo+rMPJ596ZHpx68Ke7Wt20P29v/UJ2O+4tXXMdiUhE0h5C7npSjN SgyinUhzRzr3c+Erx40epNpejrrnifA06TETTO7CstxbkMwRq67c3gHyFVZ64U5hgk WIkHXKuS98S4f5zxHaMLTB4c6nCW6D0+L3iS09eYT7pCn5NhO1/QDovuqmjBYu9cCp jxZC9rqO7pOBLdyHIaLOSjNtHsKeA+k+EnHLc/En3LAX8zuj1Ksx5O9Q6yZlL31abn 6AohkcSPeZFVgIPDR7GAqL160alpYRTPdiMdYzQJJcpxIm3/leUl/tbJ9DzD1/vWDv fyHXq/X9fzZng== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbV6dtfz9rxl; Wed, 14 Apr 2021 11:13:26 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:48 +0200 Message-Id: <20210414091303.6990-22-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1618391755; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ItyYx67Q1/UcD6vn9FPdSbzHAgEIKQ1XAdjlQmLqDc0=; b=QaQL5BhtFtl/v+vgkpyMuWeTcPL+5mscO+45XPTJ1Pyj8azf7lm+sSZK5DlgrCP8Sg9Uet 2pr6YZ2nRXlhy8/MNDh+PA6RxG9fbfMMY0aR6H6B1UL6QgVcC7m0jYirq+k/DXDJ2rvMM6 LlEvzTlb8w4pC7EwmIb9HZWQGN2e3FopYIThkAP8+hEH4zkBO04R6bF3Gsu9AgF783Uji6 0dEENWIHyARcNBJDXagA95dD0BB2K9VkaHl0cUS2Fkk2GBtpsYJdjlYgRYOropd534fnid S29xgp2Q3tinup/8mW56o7wSwvWkQY98hHb6oIoy0gVdyUR1nEgLKUeqd7+Syg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618391755; a=rsa-sha256; cv=none; b=PjZ7ErquCjW3xzeE0OGACV032NWNZBi/7uVx3CpuuRuitMuC2rjTdeb/VtGWSb1hU1cgU4 UdpiuCdcfm6HcoCAn28GTDfBAnEwYg3geME5mgOn4mW8+u9IgcHU3qM5gnIER7+5ogwIOE nbMki32X5ZeLsgIe+rg0/zByGP+czSGPPiDvusH5wk4IKoyfaWKjwDxkS9WHXcyxP7w0cF aVdqr21auQAfyNv3dN86wmjBntI3WUR36S2dL+PPMlZIMnSTi2f2msSwjopu6TzJvp95Nm 7PPo4tLjPemq2NX9c+wrGSYrlaanmxSFUPL2t63B4AT6nu0om0h7qYwG1aEgXA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=L2eFR4Np; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 4.47 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=L2eFR4Np; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 42F0C23916 X-Spam-Score: 4.47 X-Migadu-Scanner: scn0.migadu.com X-TUID: UTCV9um3HtZL * 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 193a9fcc58..7f3599bd3a 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) -- 2.31.1