From patchwork Thu Dec 31 19:54:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Soo X-Patchwork-Id: 26132 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 661A827BC05; Thu, 31 Dec 2020 19:55:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A4B5227BC06 for ; Thu, 31 Dec 2020 19:55:12 +0000 (GMT) Received: from localhost ([::1]:41750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kv42R-0001DZ-Jj for patchwork@mira.cbaines.net; Thu, 31 Dec 2020 14:55:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv42J-0001BN-1A for guix-patches@gnu.org; Thu, 31 Dec 2020 14:55:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58272) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kv42I-0003zD-PD for guix-patches@gnu.org; Thu, 31 Dec 2020 14:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kv42I-0006lb-Nm for guix-patches@gnu.org; Thu, 31 Dec 2020 14:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45575] gnu: Update ocaml-merlin Resent-From: John Soo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Dec 2020 19:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45575 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 45575@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160944448925987 (code B ref -1); Thu, 31 Dec 2020 19:55:02 +0000 Received: (at submit) by debbugs.gnu.org; 31 Dec 2020 19:54:49 +0000 Received: from localhost ([127.0.0.1]:41585 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv421-0006l2-KC for submit@debbugs.gnu.org; Thu, 31 Dec 2020 14:54:48 -0500 Received: from lists.gnu.org ([209.51.188.17]:34972) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv41z-0006kt-70 for submit@debbugs.gnu.org; Thu, 31 Dec 2020 14:54:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv41y-0000oe-TK for guix-patches@gnu.org; Thu, 31 Dec 2020 14:54:42 -0500 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:41931) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kv41t-0003od-QB for guix-patches@gnu.org; Thu, 31 Dec 2020 14:54:42 -0500 Received: by mail-pl1-x631.google.com with SMTP id y8so10374806plp.8 for ; Thu, 31 Dec 2020 11:54:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version; bh=bp6L8eWAVRspwJv0xepJJNYKM+ouaXP+ym79rY+gEfc=; b=XgmSXwmJSeh7wDvQXc0tsRcrVtMS+Mk0pRfW7lGnAr+KhuvYKcHqhmuWMKcfQ1+Y8e ERMJibOsMfqvRF9OTYDWZO7kdXSn4pExLprLzKK0dwTO5MWUt16o20o++x2/ArcVG2V7 HFo1ui+Tj/Pes5IF1+E+5W+QRY0u+cojOXrT7BCFqSgxP3yphtCfNxq8hwdq3rfoUlGb SLTLN12hfFgMW2/HPzw4hul+Qj4rnJuJ7rz5PPw2F1UpnGEO2bUKwB/hs7O0+RkKmDoA nAjrY3EAI9kXxeG+ypzDG3Zj9EpghN2r/YuoIbjHjz/3Oj0MYB6MAi/nPcrJDfU7Jel2 LNMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=bp6L8eWAVRspwJv0xepJJNYKM+ouaXP+ym79rY+gEfc=; b=JpbeYYsNh6U0S2L0f59Q4PVc4bP10p+BOf/4mHFcIdn3F5HmdWCL5bRDQiNmJxkFRQ AipyBBIm7s0iuf8ztFHSXbzE/9vP2d6utNXWjofI5meB12WDFUq49/xyTHjway/2Ne/2 Mw6JRh0uGifBqHFraDuIbDDE8uwCsLwqJgPbClOUQC02FUTgVL2m35ra/3/G63HbrMsY Aa96G+ttSGo+SCZC2IUYfqdGK3WsPCD8nkEcuBTswWWByLkkk3taP6r/ECXeB8abhigQ 56gCzekaRE5KjNQgMKvuEVlqpTvzCFl+XGuf1a8F6tYiUB4LkVhEOuevqGTzyhWY3rvw 7obw== X-Gm-Message-State: AOAM530Ejf84nRONS68JeoCjRXKW8yeSGuz2TJd9dae/1OSDnWK11RPz OBFK21/li3g5pGVCzJO1P8fQJm/kD01VKw== X-Google-Smtp-Source: ABdhPJwWcD2zDAGVYp7RwYQXQjWRUsykGyqq2Fr8Z3EILXIV8HU9kvbr1/aBB5myKB0iYYBX2JXvGg== X-Received: by 2002:a17:902:9a86:b029:dc:104:1902 with SMTP id w6-20020a1709029a86b02900dc01041902mr38985947plp.50.1609444475770; Thu, 31 Dec 2020 11:54:35 -0800 (PST) Received: from ecenter ([2600:1700:83b0:8bd0::7a8]) by smtp.gmail.com with ESMTPSA id z13sm11782103pjt.45.2020.12.31.11.54.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Dec 2020 11:54:34 -0800 (PST) From: John Soo Date: Thu, 31 Dec 2020 11:54:33 -0800 Message-ID: <87eej54upy.fsf@asu.edu> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=jsoo1@asu.edu; helo=mail-pl1-x631.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" X-getmail-retrieved-from-mailbox: Patches Hi Guix, After working with ocaml a little, I felt the need to have a current merlin. I kept the 4.07 variants of packages but I don't understand why they exist. Thanks! John From 4427d0313fc07a8a2ff342575c7fe1e9c2a3b912 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 31 Dec 2020 11:48:15 -0800 Subject: [PATCH 9/9] gnu: Add ocaml-merlin. * gnu/packages/ocaml.scm (ocaml-merlin): New variable. * gnu/packages/ocaml.scm (ocaml4.07-merlin): Inerhit from ocaml-merlin. --- gnu/packages/ocaml.scm | 47 +++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2975f866c9..bb5d6c4e92 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -71,6 +71,7 @@ #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages virtualization) + #:use-module (gnu packages web) #:use-module (gnu packages web-browsers) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -4041,8 +4042,45 @@ The test mode allows to ensure that shell scripts and OCaml fragments in the documentation always stays up-to-date.") (license license:isc))) +(define-public ocaml-merlin + (package + (name "ocaml-merlin") + (version "3.4.2") + (home-page "https://ocaml.github.io/merlin/") + (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) + (inputs + `(("ocaml-biniou" ,ocaml-biniou) + ("ocaml-yojson" ,ocaml-yojson) + ("ocaml-easy-format" ,ocaml-easy-format))) + (native-inputs + `(("ocaml-findlib" ,ocaml-findlib) + ("ocaml-mdx" ,ocaml-mdx) + ("jq" ,jq))) + (propagated-inputs + `(("ocaml-dot-merlin-reader" ,ocaml-dot-merlin-reader))) + (arguments + `(#:package "merlin" + #:test-target "tests")) + (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 ocaml4.07-merlin (package + (inherit ocaml-merlin) (name "ocaml4.07-merlin") (version "3.2.2") (home-page "https://ocaml.github.io/merlin/") @@ -4056,7 +4094,6 @@ documentation always stays up-to-date.") (sha256 (base32 "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb")))) - (build-system dune-build-system) (inputs `(("ocaml-biniou" ,(package-with-ocaml4.07 ocaml-biniou)) ("ocaml-yojson" ,(package-with-ocaml4.07 ocaml-yojson)) @@ -4068,13 +4105,7 @@ documentation always stays up-to-date.") #:tests? #f ;; Errors in tests in version 3.2.2 #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) - (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))) + #:dune ,ocaml4.07-dune)))) (define-public ocaml4.07-gsl (package -- 2.29.2