From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id ICfNEytK6l/3TgAA0tVLHw (envelope-from ) for ; Mon, 28 Dec 2020 21:12:11 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id yMCyDytK6l9YDAAA1q6Kng (envelope-from ) for ; Mon, 28 Dec 2020 21:12:11 +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 E88389402A9 for ; Mon, 28 Dec 2020 21:12:10 +0000 (UTC) Received: from localhost ([::1]:59176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktzoH-0000Wv-UG for larch@yhetil.org; Mon, 28 Dec 2020 16:12:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktznJ-0007gd-F2 for guix-patches@gnu.org; Mon, 28 Dec 2020 16:11:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53743) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktznJ-0006Zd-0I for guix-patches@gnu.org; Mon, 28 Dec 2020 16:11:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktznI-0006lr-SN for guix-patches@gnu.org; Mon, 28 Dec 2020 16:11:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v3 14/14] gnu: Add ocaml-merlin. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 21:11:08 +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.160918986525968 (code B ref 45498); Mon, 28 Dec 2020 21:11:08 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 21:11:05 +0000 Received: from localhost ([127.0.0.1]:37047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktznE-0006kZ-Hd for submit@debbugs.gnu.org; Mon, 28 Dec 2020 16:11:05 -0500 Received: from mout01.posteo.de ([185.67.36.65]:47472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktzmy-0006iF-Au for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 16:10:48 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 85B3116005C for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 22:10:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609189842; bh=SVFDT16Q1q1ekl4JMbt3f3Edio7OZQW6MJ3alKabIWY=; h=From:To:Cc:Subject:Date:From; b=PLJ/WE5poMjB92gUVEU6FYP8sDRHsyNWiXoJ/hJde4yjngwj6e9BVHPo9McfJbm7A pmM/5NtiX6mdFEx9hjwQ2Dk9QAsvQNFB+ALGDsr4MJM0mk/6LlN91a+GTqO9R54LSZ LcEPiQujZNYVQJY5VsZyiJZNmLct7ZS1eVan4fKZfRS3u6r0X2MmsZ4OKmJCzrUzKp LPAXEWEfxGS5pSiW/3fOvWx4xe6MaMgEXn5jlEP+xNp08c6Fpxteb0JQckc4Ciy5k+ skgpwg+OqKLMU+lJ6vlo8c4bvpUl+rHjloI/oMic4of+Ht3cksy7q5QWYnCJ/lFxzc yXVeWTLUeSX4w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4VZV16l5z9rxL; Mon, 28 Dec 2020 22:10:42 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 22:10:16 +0100 Message-Id: <20201228211016.8448-14-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228211016.8448-1-pukkamustard@posteo.net> References: <86a6txfxiz.fsf@posteo.net> <20201228211016.8448-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=PLJ/WE5p; 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: E88389402A9 X-Spam-Score: 3.78 X-Migadu-Scanner: scn0.migadu.com X-TUID: GybujSWadvuM * gnu/packages/ocaml.scm (ocaml-merlin): New variable. (ocaml4.07-merlin): Inherit from ocaml-merlin. --- gnu/packages/ocaml.scm | 54 ++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8efc7caba4..f3f275046f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3935,11 +3935,10 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") @code{ocaml-merlin} configurations.") (license license:expat))) -(define-public ocaml4.07-merlin +(define-public ocaml-merlin (package - (name "ocaml4.07-merlin") - (version "3.2.2") - (home-page "https://ocaml.github.io/merlin/") + (name "ocaml-merlin") + (version "3.4.2") (source (origin (method git-fetch) @@ -3949,18 +3948,19 @@ 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-yojson" ,(package-with-ocaml4.07 ocaml-yojson)))) + `(("ocaml-yojson" ,ocaml-yojson) + ("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. @@ -3968,6 +3968,34 @@ 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-yojson" ,ocaml-yojson))) + (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