From patchwork Fri Jan 13 10:54:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 46083 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 BD13527BBEB; Fri, 13 Jan 2023 10:56:52 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 AE43427BBE9 for ; Fri, 13 Jan 2023 10:56:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGHjB-0002Xg-1R; Fri, 13 Jan 2023 05:56:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pGHj9-0002Wf-3n for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pGHj8-0002n5-HR for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGHj8-0007Yh-Dv for guix-patches@gnu.org; Fri, 13 Jan 2023 05:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59487] [PATCH v3 1/6] gnu: Add ocaml-cinaps. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Jan 2023 10:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59487 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59487@debbugs.gnu.org Cc: pukkamustard , julien@lepiller.eu, raingloom Received: via spool by 59487-submit@debbugs.gnu.org id=B59487.167360731328919 (code B ref 59487); Fri, 13 Jan 2023 10:56:02 +0000 Received: (at 59487) by debbugs.gnu.org; 13 Jan 2023 10:55:13 +0000 Received: from localhost ([127.0.0.1]:49680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiK-0007WI-ON for submit@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:13 -0500 Received: from mout01.posteo.de ([185.67.36.65]:55741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGHiI-0007Vt-Mt for 59487@debbugs.gnu.org; Fri, 13 Jan 2023 05:55:11 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 2C7092402B2 for <59487@debbugs.gnu.org>; Fri, 13 Jan 2023 11:55:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1673607305; bh=tTjzM73dIKBsgYaSDhp2WhTeg//SSSj0uOw3Rs/OGIo=; h=From:To:Cc:Subject:Date:From; b=ab9U1UYzVGt2Pm2EzdvIN2VkSRXiPfM1d7qcz/0f+UVzZR9bldFmix2zkwNKifAkt IR3+WpPGA4dEvYnTLRLRcsa80oBsrTricBRqiildVnltXD69/V68CFz7+8JEn9gRWy +uXJHktUf7aTfDexWBFtnrjCAE8CWvo8M2ppmrRl41bt/j7WrIpMmIiXlCNZFDgllg mB0bIKIoltavayXDko0kmfGuie8jcRWLPWq90f+6coK3Db0FP2R/TEHnxhxVnRtlls y4Ru7wqLfnI/YdKtr+BejR7zw2s3d25p8/vrl9Hg8XxfphryP7VWO7DZdOTiStOiFn hE/myPUjdLStQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Ntdbr343yz6tmQ; Fri, 13 Jan 2023 11:55:04 +0100 (CET) From: pukkamustard Date: Fri, 13 Jan 2023 10:54:35 +0000 Message-Id: <20230113105440.28258-2-pukkamustard@posteo.net> In-Reply-To: <20230113105440.28258-1-pukkamustard@posteo.net> References: <20230113105440.28258-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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-cinaps): New variable. --- gnu/packages/ocaml.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5109cd052a..b37cfa4681 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5939,6 +5939,36 @@ (define-public ocaml-ppx-derivers as part of the same ocaml-migrate-parsetree driver.") (license license:bsd-3))) +(define-public ocaml-cinaps + ;; The commit removes the unused dependency of ocaml-ppx-jane. We need to + ;; use this as we would otherwise have a dependency loop between + ;; ocaml-ppxlib and ocaml-ppx-jane. + (let ((commit "d974bb2db3ab1ab14e81f989b5bdb609462bff47") + (revision "0")) + (package + (name "ocaml-cinaps") + (version (git-version "0.15.1" revision commit)) + (home-page "https://github.com/ocaml-ppx/cinaps") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "00kb04vqlnk1pynqjhna5qhn8790ab17baxf4na5py1l1h1js8qx")))) + (build-system dune-build-system) + (propagated-inputs (list ocaml-re)) + (synopsis "Trivial metaprogramming tool for OCaml") + (description + "Cinaps is a trivial Metaprogramming tool using the OCaml toplevel. It is based +on the same idea as expectation tests. The user write some OCaml code inside +special comments and cinaps make sure that what follows is what is printed by +the OCaml code.") + (license license:expat)))) + (define-public ocaml-ppxlib (package (name "ocaml-ppxlib")