From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cGLuNITCmGDcVQEAgWs5BA (envelope-from ) for ; Mon, 10 May 2021 07:20:04 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id mH20MITCmGDrNwAA1q6Kng (envelope-from ) for ; Mon, 10 May 2021 05:20:04 +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 7AB07BE93 for ; Mon, 10 May 2021 07:20:04 +0200 (CEST) Received: from localhost ([::1]:43336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lfyKp-0005pY-Ll for larch@yhetil.org; Mon, 10 May 2021 01:20:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lfyJA-0000E7-0K for guix-patches@gnu.org; Mon, 10 May 2021 01:18:20 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lfyJ9-0003ga-NG for guix-patches@gnu.org; Mon, 10 May 2021 01:18:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lfyJ9-0000Wm-JS for guix-patches@gnu.org; Mon, 10 May 2021 01:18:19 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH v2 35/43] gnu: Add ocaml-ppx-inline-test. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 10 May 2021 05:18:19 +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.16206238851746 (code B ref 47768); Mon, 10 May 2021 05:18:19 +0000 Received: (at 47768) by debbugs.gnu.org; 10 May 2021 05:18:05 +0000 Received: from localhost ([127.0.0.1]:57056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIu-0000Rt-OG for submit@debbugs.gnu.org; Mon, 10 May 2021 01:18:05 -0400 Received: from mout02.posteo.de ([185.67.36.66]:49499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lfyIT-0000Jw-23 for 47768@debbugs.gnu.org; Mon, 10 May 2021 01:17:38 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 959522400FD for <47768@debbugs.gnu.org>; Mon, 10 May 2021 07:17:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1620623856; bh=cD61tqoTXmwAURcENBbp3k7uXZZGWJJ/I6ZJl1P+gtY=; h=From:To:Cc:Subject:Date:From; b=MRnCPmSSXyBI0yUG+H3SrW+2vpJi3modW/dPJBhwAF+kAsH3tG5HDE8hRzHaKHV1+ MWbUcuGYoqoS4kbjCyKg4+VwwvuY/gCGlYFOcX0mARRjHsTtnJ+Om/CMDDesAC9E/Z 7Rr4uf3lhAb4WqjD8z/eItBGjnaCgii/b0S0kEGx05guRL2xWtY6KJ1hYZ7aqYCV/x 0gBPxKIJHA1A62iWC0naqNzW75Xqn4fvtkqh8QGslbYMvmmYiOp3xY5dphRo3cVCzf f9GnigxBHhwTPXItx2gO8UebumPYaJys9zxWIAgO7CoTL2FK5ZTpsm2rfyiTLGUDMu PZxeeIzd3Kysg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Fdq7M3ptXz9rxh; Mon, 10 May 2021 07:17:35 +0200 (CEST) From: pukkamustard Date: Mon, 10 May 2021 05:16:20 +0000 Message-Id: <20210510051628.15359-36-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 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=1620624004; 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=QECvvgcbbii8za9Dji4/k3HjEwvA0giUd/O2+aQ8kT8=; b=lvdmB5/uu22KItXS1mN5RjfQRzqHOGEAIaYBUC6JCT3bBv1BAUBXeVqga2BpXTvRca4Saf twK9RRH/iasmErndWCI40wPThsHXuyNvvauoUYzHuYaHxHPu1+AEdnP24Q6uafblJOdtZI BB2BPjn/C5GjzeXIBBALuCncQhaWDnGTXH8Zhgq679A94b8WX2Y+IpZbj8GvWOUkCld4Gd Ay6HUAYiHHIMIlcFHSTKdwkPugliwS0U42c15n/eb1zY8W1krwuxFOxjWK+6HcqEbazMvn xSiZWQYBCzlv8oSesA8KPNkm4jIAM0CINyXRCWx+TKIJ6dnPohxVqvBXDgbwpA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620624004; a=rsa-sha256; cv=none; b=DxeIqAm+f+wQaUKZsWoCEQvK6PCKcopmlEKbDTyZPZ6nlTPU4/QZ3SYPYKgSRmi0wEBI9Z VFpGT0Mb4tKM53rkU+MdFKD+5EuOFH+er8vTm7mFQb5e/ZPrcrhgXHiOEEo9kcT4nRROjT K5v7U0vX3xZctJkVWTmVmwpwUhbrWSvF0tX9mnkycE3MZxAKumnBhY70k5/19RWiz2Wc18 YQg2VpURaeRCngrhW53ORG7dIH0yED49DWNFfiqcktg+1j9TzdSOcoiE99U5RLR50zhhQz oysfI3cPMnVWGCYcL+8UJ2vqkbgFSVkASYayqaiAofcnIVZelHZGmavZRFr9VA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=MRnCPmSS; 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: 3.65 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=MRnCPmSS; 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: 7AB07BE93 X-Spam-Score: 3.65 X-Migadu-Scanner: scn0.migadu.com X-TUID: i0zCe+0paOJi * gnu/packages/ocaml.scm (ocaml-ppx-inline-test): New variable. (ocaml4.07-ppx-inline-test): Inherit from ocaml-ppx-inline-test. --- gnu/packages/ocaml.scm | 69 ++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 43c6c7ae0f..e91c2e14b3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4193,10 +4193,10 @@ packages.") since the start of the Unix epoch.") (license license:expat))) -(define-public ocaml4.07-ppx-inline-test +(define-public ocaml-ppx-inline-test (package - (name "ocaml4.07-ppx-inline-test") - (version "0.12.0") + (name "ocaml-ppx-inline-test") + (version "0.14.1") (home-page "https://github.com/janestreet/ppx_inline_test") (source (origin @@ -4207,29 +4207,52 @@ since the start of the Unix epoch.") (file-name (git-file-name name version)) (sha256 (base32 - "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50")))) + "1ajdna1m9l1l3nfigyy33zkfa3yarfr6s086jdw2pcfwlq1fhhl4")))) (build-system dune-build-system) (arguments - ;see home page README for further information - `(#:tests? #f - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (inputs - `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base)) - ("ocaml-migrate-parsetree" - ,(package-with-ocaml4.07 ocaml-migrate-parsetree)) - ("ocaml-compiler-libs" ,(package-with-ocaml4.07 ocaml-compiler-libs)) - ("ocaml-sexplib0" ,(package-with-ocaml4.07 ocaml-sexplib0)) - ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) - ("ocaml-ppxlib" ,(package-with-ocaml4.07 ocaml-ppxlib)))) - (properties `((upstream-name . "ppx_inline_test"))) + `(#:tests? #f)) ;see home page README for further information + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-compiler-libs" ,ocaml-compiler-libs) + ("ocaml-sexplib0" ,ocaml-sexplib0) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-ppxlib" ,ocaml-ppxlib) + ("ocaml-time-now" ,ocaml-time-now))) + (properties `((upstream-name . "ppx_inline_test") + (ocaml4.07-variant . ,(delay ocaml4.07-ppx-inline-test)))) (synopsis "Syntax extension for writing in-line tests in ocaml code") (description "This package contains a syntax extension for writing in-line tests in ocaml code. It is part of Jane Street's PPX rewriters collection.") (license license:expat))) +(define-public ocaml4.07-ppx-inline-test + (package-with-ocaml4.07 + (package + (inherit ocaml-ppx-inline-test) + (name "ocaml-ppx-inline-test") + (version "0.12.0") + (home-page "https://github.com/janestreet/ppx_inline_test") + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append home-page ".git")) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nyz411zim94pzbxm2l2v2l9jishcxwvxhh142792g2s18r4vn50")))) + (propagated-inputs + `(("ocaml-base" ,ocaml-base) + ("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-compiler-libs" ,ocaml-compiler-libs) + ("ocaml-sexplib0" ,ocaml-sexplib0) + ("ocaml-stdio" ,ocaml-stdio) + ("ocaml-ppxlib" ,ocaml-ppxlib))) + (properties `((upstream-name . "ppx_inline_test")))))) + (define-public ocaml-bindlib (package (name "ocaml-bindlib") @@ -4246,7 +4269,7 @@ collection.") "1f8kr81w8vsi4gv61xn1qbc6zrzkjp8l9ix0942vjh4gjxc74v75")))) (build-system ocaml-build-system) (arguments - `(#:tests? #f ;no tests + `(#:tests? #f ;no tests #:use-make? #t #:phases (modify-phases %standard-phases @@ -5442,7 +5465,7 @@ many values).") #:findlib ,ocaml4.07-findlib #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) + `(("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)))) @@ -5825,7 +5848,7 @@ useful errors on failure.") ("ocaml-ppx-custom-printf" ,(package-with-ocaml4.07 ocaml-ppx-custom-printf)) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) + ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-variants-conv" ,ocaml4.07-ppx-variants-conv) ("ocaml-stdio" ,(package-with-ocaml4.07 ocaml-stdio)) @@ -6019,7 +6042,7 @@ functions from type definitions.") ("ocaml-ppx-fail" ,ocaml4.07-ppx-fail) ("ocaml-ppx-fields-conv" ,(package-with-ocaml4.07 ocaml-ppx-fields-conv)) ("ocaml-ppx-here" ,(package-with-ocaml4.07 ocaml-ppx-here)) - ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) + ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-let" ,(package-with-ocaml4.07 ocaml-ppx-let)) ("ocaml-ppx-optcomp" ,(package-with-ocaml4.07 ocaml-ppx-optcomp)) ("ocaml-ppx-optional" ,(package-with-ocaml4.07 ocaml-ppx-optional)) @@ -6251,7 +6274,7 @@ standard library that was developed by Jane Street.") ("ocaml-ppx-assert" ,(package-with-ocaml4.07 ocaml-ppx-assert)) ("ocaml-ppx-base" ,(package-with-ocaml4.07 ocaml-ppx-base)) ("ocaml-ppx-hash" ,(package-with-ocaml4.07 ocaml-ppx-hash)) - ("ocaml-ppx-inline-test" ,ocaml4.07-ppx-inline-test) + ("ocaml-ppx-inline-test" ,(package-with-ocaml4.07 ocaml-ppx-inline-test)) ("ocaml-ppx-jane" ,ocaml4.07-ppx-jane) ("ocaml-ppx-sexp-conv" ,(package-with-ocaml4.07 ocaml-ppx-sexp-conv)) ("ocaml-ppx-sexp-message" ,ocaml4.07-ppx-sexp-message) -- 2.31.1