From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 +J0SIDpynGPT3AAAbAwnHQ (envelope-from ) for ; Fri, 16 Dec 2022 14:27:22 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 2DwwHzpynGM3XwAAG6o9tA (envelope-from ) for ; Fri, 16 Dec 2022 14:27:22 +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 53CDE3E96B for ; Fri, 16 Dec 2022 14:27:22 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Ajz-0006Wa-8a; 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-0006Sj-G9 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 1p6Ajx-0007WB-7L for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Ajx-0003A4-2p for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 28/28] gnu: Add ocaml5.0-merlin. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:27:05 +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.167119719712063 (code B ref 60120); Fri, 16 Dec 2022 13:27:05 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:37 +0000 Received: from localhost ([127.0.0.1]:49360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6AjU-00038P-IA for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:36 -0500 Received: from mout01.posteo.de ([185.67.36.65]:56801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aj2-00033m-GI for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:09 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 0132E240029 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:26:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197163; bh=VSQsJQyQ3+Bn6XXCFe+Ypqzn4O5AK0UDRtR4hug76yQ=; h=From:To:Cc:Subject:Date:From; b=Kbw0OO/F2n09xP5td/hrQLqql3nqBJC0hTNUCzVfTioFwT/M+BhZ2TYUNaIUO5wNH IV8v0FleT+ZJtr/kFQxsYHi/cXQPAHsdfv2QBv7BQvOLWeQt7TZZ6sX+Ku6fsSNq7z HY5GP5cCz7kSJVXKMbodX/QacrYmsEdZQ3e3hohDuhYiekv2sO36glWO9W8USzbj6Y bkqR8y0r1YXv8mke9u0U4Pg7bYXJy/21QFYjqqtsUkSWuig+nNlv1pmVD5OSHfOVsV eEa1vYd0VwmyZGZ/cOvlebPzlHoUua1dUEX7w4IGtHQSO9KCGoIUUWaWgob5Xm7B6E 8bcF9ruZA0VAg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGy4KNqz6tm4; Fri, 16 Dec 2022 14:26:02 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:27 +0000 Message-Id: <20221216132527.2539-28-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=1671197242; 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=xc8uwh5WEPFz4H9oG4vhjtN5cYtQT5jchyAKDIyBgH0=; b=f76mkKGR8XCiVf78RLWP/alLLDHprSp+8HfsysDce39NYsEbjbVhNn5fNUuEdrSds1sw3z 4qjzoyBhhgStATcv0f3/MLv4X2BQdBkvvsvJg18tE69sXgiHRpn+0eA7wW8OQUtSdXUHu4 f26SAr/L5rrsW0swNjHlyKOylahy8SONyn1uh3I84OFtALaknBZjZU+QYUc2MDJYFIdEPz TPlAXX+khyzyN8oufBLslBS/rw/E88OOB2K/MXCteZd7m85mlf/YQUivXqHEFUK/GgxQDD 3Bk3i/8UMgl8HP8X1xDDCYG+3vRZWq+bQwPgxDQS2u5ZxfyC8gH4kYeeGIiFLg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b="Kbw0OO/F"; 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=1671197242; a=rsa-sha256; cv=none; b=DiJAYfAwMTg4xl0K53RSGda83lBBdKiSPZ0evIUJYJ62C4o+reQjx9RwoPZxfZwP2dTnEV 5Ld8nDlW0mJRQNz5gKpqAULHJeCeRq7w79XU6stVe7qyh+HKx+BabXbUAHUCg+nkuGWJi5 3J3sJrM0RsTzLOESF3pAZp5MsXn2alS5Z8svCZSnjuzMhLVOEn5YlgUhp5qzq8JqgTAhAb Rks7E2OtVKzKINmBhcOULnUbmVbbdwaYLA2jinKgwBdceIc/bNydgwDyBi6KpXySoxqiIM DezIoa01dLgphfe1baidgaAtJCzyW3slniPg88HrxPtX1s091MuHSC0XoNgaVw== X-Migadu-Spam-Score: -1.37 X-Spam-Score: -1.37 X-Migadu-Queue-Id: 53CDE3E96B 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="Kbw0OO/F"; 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: 2Urh5Y2WR6qH * gnu/packages/ocaml.scm (ocaml5.0-merlin): New variable. --- gnu/packages/ocaml.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index dc824626fd..1e4fb46645 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5435,6 +5435,7 @@ (define-public ocaml-merlin (when tests? (invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader"))))))) (propagated-inputs (list ocaml-merlin-lib ocaml-yojson)) + (properties `((ocaml5.0-variant . ,(delay ocaml5.0-merlin)))) (native-inputs (list ocaml-dot-merlin-reader ; required for tests ocaml-ppxlib @@ -5447,6 +5448,32 @@ (define-public ocaml-merlin Atom.") (license license:expat))) +(define-public ocaml5.0-merlin + (package-with-ocaml5.0 + (package + (inherit ocaml-merlin-lib-500) + (name "ocaml-merlin") + (arguments + '(#:package "merlin" + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader"))))))) + (propagated-inputs (list ocaml-merlin-lib ocaml-yojson)) + (native-inputs + (list ocaml-dot-merlin-reader ; required for tests + ocaml-ppxlib + ocaml-mdx + jq)) + (synopsis "Context sensitive completion for OCaml in Vim and Emacs") + (description "Merlin is an editor service that provides modern IDE +features for OCaml. Emacs and Vim support is provided out-of-the-box. +External contributors added support for Visual Studio Code, Sublime Text and +Atom.") + (license license:expat)))) + (define-public ocaml-gsl (package (name "ocaml-gsl") -- 2.38.1