From patchwork Fri Dec 16 13:25:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45364 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 853F827BBE9; Fri, 16 Dec 2022 13:27:23 +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 6226927BBEB for ; Fri, 16 Dec 2022 13:27:22 +0000 (GMT) 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 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-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")