From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id uEJjKV1ynGMTzgAAbAwnHQ (envelope-from ) for ; Fri, 16 Dec 2022 14:27:57 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id WJNtKV1ynGMKDwEAauVa8A (envelope-from ) for ; Fri, 16 Dec 2022 14:27:57 +0100 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 853163EC23 for ; Fri, 16 Dec 2022 14:27:57 +0100 (CET) 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 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1671197277; 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=ZijPiq1BE5P/HonMWMZduv8PMyqyDo0avtGSUq6dwco=; b=sd9K49TYPrrGOlv1L47O0RBN+4MqaTzODx6n8KnzU+44LKQzFucUdUXWOgIx5mJtDwK5aa h6Ohu4+ngVL3avO52antPiwQ4wJnyZ4y6iA8yUsMP4choOf3RZ3KMtd5CWSNoQh6Xp1mHS +uQdxmejJqcW6iudvyHqViZLUT6K8eTdhKu0UC8nGFJNw0K1/DmUGvW/rvuL/a3e0FazoL TXfMnoLG/3mNiRi9/K6sg8BXrsQjGJgWRm5o1SAi7Mdc8lENCtxA1bcs6fzIQIKUz9/CUn I3MpIEPz2jdWPj4j9x6fK+2m3hcZMrpEtsNw3WneHp00tR8dgaPtkKKfRn2a0g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=o5i9vZfe; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1671197277; a=rsa-sha256; cv=none; b=hGzydAlk7lVkBR5FkkxN7QQ5vgljsW+qKHUNQERlPXktR7Hbk1F04ibcSm6ctPgPkE5SOu qymOaAixfwQRgbHMse/OWT+R9WftKwqy/b5Jo+wGYZ4ivCIoJeM9OwgtnunaaEmaoTyk6A RJwvQm2XSQj9cAP3MOwRzLWUwNqmj1jGrD7p3XXc4a9RgIahf2J8uHYuzwHRZIZK/G+Md1 8ow0952UkMnUEJ1xe8ZMm+DjR9TBqsYyjRdqkDyWTkMx+7F/zBGD/Ghp9K2blIuihXv50I VLcnRpECnuDof45IOnhn1DMtb5zlgxUpzx5kHGSQDKaixPmm6Q8tygwJdKn/EA== X-Migadu-Spam-Score: -1.37 X-Spam-Score: -1.37 X-Migadu-Queue-Id: 853163EC23 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=o5i9vZfe; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) X-TUID: oH9Gbv7CIGlt * 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) -- 2.38.1