From patchwork Fri Dec 16 13:25:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45371 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 2B01427BBED; Fri, 16 Dec 2022 13:27:58 +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=ham 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 8BF9127BBE9 for ; Fri, 16 Dec 2022 13:27:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Ajz-0006Wo-HC; Fri, 16 Dec 2022 08:27:07 -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 1p6Ajx-0006S3-6P for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:05 -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 1p6Ajw-0007W0-Sq for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Ajw-00039x-NT for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 27/28] gnu: Add ocaml5.0-dot-merlin-reader. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:27:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119719612056 (code B ref 60120); Fri, 16 Dec 2022 13:27:04 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:36 +0000 Received: from localhost ([127.0.0.1]:49358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6AjU-00038I-7v for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:36 -0500 Received: from mout01.posteo.de ([185.67.36.65]:48325) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aj1-00033J-6J for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:07 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id A648424002D for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:26:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197161; bh=y1xVjPxIE3Fo1K2vfdsjjOZBLRBsZ5CqSRAD4RmgtTo=; h=From:To:Cc:Subject:Date:From; b=o5i9vZferU9q4SpRR4Gd3xarSzY7xzK1BzLpP+cm4A2qCzMmC6ZHCzocrWdAaoL+S RYHBSshtAaWnOyx7CdCGwPQO2Fp9xmMzjHm+6rHUDfQz5Y8McZsXwOEyMqSeyU8THn ZLmOGJuQUFeuJQtI9Wrc7M8p3vtIiKQGB7B7TSzEK8IsFuZNlm6ZpTHQ/0NQxw2+q1 kDAvsChQRnGzmqWlR7Kth47+xDWb5DZaNNwcAmG1B+2BeTeaYoyukPRmiu4nLxXYlG +dniJYT+YREmi8R3xbs6F5OiLjvOECj/RGV+uA8EB4q80ZA4H4TLryK6gDNUAUoJVA uDy4nxSbApw/w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGx1kLCz6tm4; Fri, 16 Dec 2022 14:26:01 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:26 +0000 Message-Id: <20221216132527.2539-27-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-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 (ocaml5.0-dot-merlin-reader): New variable. --- gnu/packages/ocaml.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 1b3e51001f..dc824626fd 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5405,10 +5405,23 @@ (define-public ocaml-dot-merlin-reader (arguments '(#:package "dot-merlin-reader" #:tests? #f)) ; no tests (propagated-inputs (list ocaml-merlin-lib)) + (properties `((ocaml5.0-variant . ,(delay ocaml5.0-dot-merlin-reader)))) (synopsis "Reads config files for @code{ocaml-merlin}") (description "@code{ocaml-dot-merlin-reader} is an external reader for @code{ocaml-merlin} configurations."))) +(define-public ocaml5.0-dot-merlin-reader + (package-with-ocaml5.0 + (package + (inherit ocaml-merlin-lib-500) + (name "ocaml-dot-merlin-reader") + (arguments '(#:package "dot-merlin-reader" + #:tests? #f)) ; no tests + (propagated-inputs (list ocaml5.0-merlin-lib)) + (synopsis "Reads config files for @code{ocaml-merlin}") + (description "@code{ocaml-dot-merlin-reader} is an external reader for +@code{ocaml-merlin} configurations.")))) + (define-public ocaml-merlin (package (inherit ocaml-dot-merlin-reader)