From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8VR3OybU6V8degAA0tVLHw (envelope-from ) for ; Mon, 28 Dec 2020 12:48:38 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id AFLMNibU6V+nHgAAbx9fmQ (envelope-from ) for ; Mon, 28 Dec 2020 12:48:38 +0000 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 88EEF9402B6 for ; Mon, 28 Dec 2020 12:48:38 +0000 (UTC) Received: from localhost ([::1]:42234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktrwz-0007tN-Fg for larch@yhetil.org; Mon, 28 Dec 2020 07:48:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47344) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrwY-0007MF-HO for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51249) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktrwV-000446-7I for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktrwV-0003xO-5D for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 12/12] gnu: Add ocaml-merlin. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 12:48:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.160915967615116 (code B ref 45498); Mon, 28 Dec 2020 12:48:07 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 12:47:56 +0000 Received: from localhost ([127.0.0.1]:34551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrwJ-0003vf-Er for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:55 -0500 Received: from mout02.posteo.de ([185.67.36.66]:54993) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrwB-0003ts-Dk for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:48 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 457302400FE for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 13:47:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159661; bh=c8xlQD+LPYQxbXVi30/D5FTYFKGeveXT/KDY8JTspYk=; h=From:To:Cc:Subject:Date:From; b=KFI6CcXhEwMNA2Oh21oLo9hjY6h7pEfx68Wa4e44/C2s61Hwy7v1W2GPIlPtFicHh RxHp0qW0OODHl+7jUh3y0eRDQVahSKYpRTJEv2uaxVTKf1H0i4zY4gABa2v/Z6MFFB QT4aok8eQYBBBQlJ3MnIF4+bxf7J1AE+7YCg8QqVa6vUwgkBEM52qHUzMvsDhTKZpM iGabtL6ar9qaOXUlr+tmV4zO9SEQwb/hy8ZIFDTbxV3jDGFQAsWcoucTpjVfONDcjc /zJSyEfIoiwK0yFMkjRyN4IqbMQAYU1fO87tiQ/wHKgtzm2ElYjrsMKsEnY2pUgexh JSW+GvNj83kcg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HQ45hWNz6tm6; Mon, 28 Dec 2020 13:47:40 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 13:47:18 +0100 Message-Id: <20201228124718.24736-12-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124718.24736-1-pukkamustard@posteo.net> References: <20201228124718.24736-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" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 3.78 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=posteo.net header.s=2017 header.b=KFI6CcXh; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 88EEF9402B6 X-Spam-Score: 3.78 X-Migadu-Scanner: scn0.migadu.com X-TUID: 3py/yS6ndes/ * gnu/packages/ocaml.scm (ocaml-merlin): New variable. (ocaml-dot-merlin-reader): New variable. (ocaml4.07-merlin): Inherit from ocaml-merlin. --- gnu/packages/ocaml.scm | 89 +++++++++++++++++++++++++++++++++++------- 1 file changed, 75 insertions(+), 14 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8d3a2e01f3..5b74116305 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3908,11 +3908,41 @@ Mercurial's @code{https://www.selenic.com/blog/?p=663, unified test format}. @code{craml} is released as a single binary (called @code{craml}).") (license license:isc))) -(define-public ocaml4.07-merlin +(define-public ocaml-dot-merlin-reader (package - (name "ocaml4.07-merlin") - (version "3.2.2") + (name "ocaml-dot-merlin-reader") + (version "3.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/merlin") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0i2nwkdh6cfzmnsdsr8aw86vs8j1k5jkjzrs61b9384wnffdbbmj")))) + (build-system dune-build-system) + (arguments '(#:package "dot-merlin-reader" + #:tests? #f)) ; no tests + (inputs + `(("ocaml-yojson" ,ocaml-yojson) + ("ocaml-csexp" ,ocaml-csexp) + ("ocaml-result" ,ocaml-result) + ;; XXX: following are dependencies of ocaml-yojson. Should they be + ;; propagated-inputs in ocaml-yojson? + ("ocaml-biniou" ,ocaml-biniou) + ("ocaml-easy-format" ,ocaml-easy-format))) (home-page "https://ocaml.github.io/merlin/") + (synopsis "Reads config files for @code{ocaml-merlin}") + (description "@code{ocaml-dot-merlin-reader} is an external reader for +@code{ocaml-merlin} configurations.") + (license license:expat))) + +(define-public ocaml-merlin + (package + (name "ocaml-merlin") + (version "3.4.2") (source (origin (method git-fetch) @@ -3922,20 +3952,21 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") (file-name (git-file-name name version)) (sha256 (base32 - "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb")))) + "0i2nwkdh6cfzmnsdsr8aw86vs8j1k5jkjzrs61b9384wnffdbbmj")))) (build-system dune-build-system) + (arguments '(#:package "merlin" + #:test-target "tests")) (inputs - `(("ocaml-biniou" ,(package-with-ocaml4.07 ocaml-biniou)) - ("ocaml-yojson" ,(package-with-ocaml4.07 ocaml-yojson)) - ("ocaml-easy-format" ,(package-with-ocaml4.07 ocaml-easy-format)))) + `(("ocaml-yojson" ,ocaml-yojson) + ("ocaml-biniou" ,ocaml-biniou) + ("ocaml-easy-format" ,ocaml-easy-format) + ("ocaml-csexp" ,ocaml-csexp) + ("ocaml-result" ,ocaml-result))) (native-inputs - `(("ocaml-findlib" ,ocaml-findlib))) - (arguments - `(#:package "merlin" - #:tests? #f ;; Errors in tests in version 3.2.2 - #:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) + `(("ocaml-dot-merlin-reader" ,ocaml-dot-merlin-reader) ; required for tests + ("ocaml-mdx" ,ocaml-mdx) + ("jq" ,jq))) + (home-page "https://ocaml.github.io/merlin/") (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. @@ -3943,6 +3974,36 @@ External contributors added support for Visual Studio Code, Sublime Text and Atom.") (license license:expat))) +;; ocaml-merlin 3.4.2 can not be built with old version of dune used in +;; package-with-ocaml4.07 +(define-public ocaml4.07-merlin + (package-with-ocaml4.07 + (package + (inherit ocaml-merlin) + (name "ocaml-merlin") + (version "3.2.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ocaml/merlin") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb")))) + (build-system dune-build-system) + (inputs + `(("ocaml-biniou" ,ocaml-biniou) + ("ocaml-yojson" ,ocaml-yojson) + ("ocaml-easy-format" ,ocaml-easy-format))) + (native-inputs + `(("ocaml-findlib" ,ocaml-findlib))) + (arguments + `(#:package "merlin" + ;; Errors in tests in version 3.2.2 + #:tests? #f))))) + (define-public ocaml4.07-gsl (package (name "ocaml4.07-gsl") -- 2.29.2