From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6OJwNzJN7l/CEgAA0tVLHw (envelope-from ) for ; Thu, 31 Dec 2020 22:14:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id iD0+MzJN7l9VUwAAB5/wlQ (envelope-from ) for ; Thu, 31 Dec 2020 22:14:10 +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 23CF29404D2 for ; Thu, 31 Dec 2020 22:14:10 +0000 (UTC) Received: from localhost ([::1]:36890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kv6Cu-0003za-W8 for larch@yhetil.org; Thu, 31 Dec 2020 17:14:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv6Co-0003zU-SO for guix-patches@gnu.org; Thu, 31 Dec 2020 17:14:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58480) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kv6Co-0002ML-Ks for guix-patches@gnu.org; Thu, 31 Dec 2020 17:14:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kv6Co-0001fj-G2 for guix-patches@gnu.org; Thu, 31 Dec 2020 17:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45575] Add emacs-merlin References: <87eej54upy.fsf@asu.edu> In-Reply-To: <87eej54upy.fsf@asu.edu> Resent-From: John Soo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Dec 2020 22:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45575 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 45575@debbugs.gnu.org Received: via spool by 45575-submit@debbugs.gnu.org id=B45575.16094527936364 (code B ref 45575); Thu, 31 Dec 2020 22:14:02 +0000 Received: (at 45575) by debbugs.gnu.org; 31 Dec 2020 22:13:13 +0000 Received: from localhost ([127.0.0.1]:41793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv6C1-0001eZ-AP for submit@debbugs.gnu.org; Thu, 31 Dec 2020 17:13:13 -0500 Received: from mail-pl1-f172.google.com ([209.85.214.172]:42314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv6Bz-0001eN-Vn for 45575@debbugs.gnu.org; Thu, 31 Dec 2020 17:13:12 -0500 Received: by mail-pl1-f172.google.com with SMTP id s15so10488645plr.9 for <45575@debbugs.gnu.org>; Thu, 31 Dec 2020 14:13:11 -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=IiqPHVOijpw7/HQcUPmOAlfpsIB/G+6vHjr7oheijAY=; b=MI8RogyEuu8/Uy6DO2a1mKQUabKnZ//J8/EjRL4GmL4iS76q2sWouF+gJTgV556Dcg 3utBidX4YAGIY6Sa6iMMO5zGiMtXZvAFsJfOf3I2CSWYZ91U0h/Y0U1ygOLNZ+eaqfRX Q0iDdmTSQf6rCQWsBY42Yp+x9LBOl/BfkpcILsKLWpQ5zlxUXF/wRElgYKcnDABE3RMQ lfL6QAqB7znaxolYaNM/eTMiCmfBf4virETATrqeyV/nMjc9h97Au0g28mIsXbhZikz3 nGC3il7fO4VaqR5ELLUkhHFRVNEAk0H1ZsF3k4W5JQh6SCoWnCpUEREltKopa+aQ6MQp 5hjg== 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=IiqPHVOijpw7/HQcUPmOAlfpsIB/G+6vHjr7oheijAY=; b=pacGsZS43RU3GxIeCC70B6wtGw41JUmYaXOXkREwtcabPO0kMIJTXaspZQ6mvKpaYH tAZ5gnug+ZDKBqElpU/wK3Z5FWM7wqNEHNUVV2zJZ+fm/hfhFb6mWJ8839zzPkYtMEsn aowGW/iT596UeTF7EQJUQgoIsiHUTWGB7UdITfqt4QD6hUcAAlWjdz4glIwBoGo1Ic+F 3waqgW2s/xaUhGG6uZMT3n3BnoBxStOGnDpNbBCy61ImP4OWB9ygnHinhINUBPGArmMi hh60NleuiCT+fWXbwruN/XdruPm0TwsNL2bVRxLhaYJJtichAJe/HN7wJUpZpVFC4hsa 1Vuw== X-Gm-Message-State: AOAM5337DoamwsovfliAnvcZlyQ1CTl/I+wZx/tR7RmYBGWmDA29Ho2E 9TkpPURr7HHABmbUobziE+P1Eba3m0pxww== X-Google-Smtp-Source: ABdhPJy0wocMzL4psaEgejpw9xZpwY+wERDCRFELqEG7fBw34byAeh5uH/icSFGOUe5t3DAget/nCA== X-Received: by 2002:a17:90b:8d5:: with SMTP id ds21mr14737391pjb.5.1609452785987; Thu, 31 Dec 2020 14:13:05 -0800 (PST) Received: from ecenter ([2600:1700:83b0:8bd0::7a8]) by smtp.gmail.com with ESMTPSA id y23sm49891538pfc.178.2020.12.31.14.13.04 for <45575@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Dec 2020 14:13:05 -0800 (PST) From: John Soo Date: Thu, 31 Dec 2020 14:13:04 -0800 Message-ID: <875z4h4ob3.fsf@asu.edu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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: -1.23 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=asu-edu.20150623.gappssmtp.com header.s=20150623 header.b=MI8RogyE; dmarc=fail reason="SPF not aligned (relaxed)" header.from=asu.edu (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: 23CF29404D2 X-Spam-Score: -1.23 X-Migadu-Scanner: scn1.migadu.com X-TUID: uNgaV96WqnQO --=-=-= Content-Type: text/plain Another oops, I forgot to put the base32 hash string on the same line as base32. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-emacs-merlin.patch >From 14377bc2ee93c17ac9ead0669a27b872ad86ab48 Mon Sep 17 00:00:00 2001 From: John Soo Date: Thu, 31 Dec 2020 13:34:57 -0800 Subject: [PATCH] gnu: Add emacs-merlin. * gnu/packages/emacs-xyz.scm (emacs-merlin): New variable. * gnu/packages/ocaml.scm (ocaml-merlin): [arguments] Remove elisp from output, [description] Note location of emacs package. --- gnu/packages/emacs-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ gnu/packages/ocaml.scm | 11 +++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0d8d6837e1..8ab2c96db5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -135,6 +135,7 @@ #:use-module (gnu packages haskell-apps) #:use-module (gnu packages ibus) #:use-module (gnu packages ncurses) + #:use-module (gnu packages ocaml) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages telephony) @@ -646,6 +647,43 @@ process, passing on the arguments as command line arguments.") "Magit-annex adds a few git-annex operations to the Magit interface.") (license license:gpl3+)))) +(define-public emacs-merlin + (package + (name "emacs-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 emacs-build-system) + (propagated-inputs + `(("emacs-auto-complete" ,emacs-auto-complete) + ("emacs-company" ,emacs-company) + ("emacs-iedit" ,emacs-iedit) + ("ocaml-merlin" ,ocaml-merlin))) + (arguments + `(#:tests? #f ; No tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'setup-emacs-build + (lambda* (#:key inputs #:allow-other-keys) + (let ((merlin (assoc-ref inputs "ocaml-merlin"))) + (chdir "emacs") + (for-each make-file-writable (find-files "." "\\.el$")) + (emacs-substitute-variables "merlin.el" + ("merlin-command" + (string-append merlin "/bin/ocamlmerlin"))))))))) + (synopsis "Context sensitive completion for OCaml in Emacs") + (description "Merlin is an editor service that provides modern IDE +features for OCaml. This package provides the Emacs support for Merlin.") + (license license:expat))) + (define-public emacs-minions (package (name "emacs-minions") diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bb5d6c4e92..3e71f17dc8 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4070,12 +4070,19 @@ documentation always stays up-to-date.") `(("ocaml-dot-merlin-reader" ,ocaml-dot-merlin-reader))) (arguments `(#:package "merlin" - #:test-target "tests")) + #:test-target "tests" + #:phases + ;; FIXME: Make merlin.vim into a separate package. + (modify-phases %standard-phases + (add-after 'install 'remove-emacs + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively + (string-append (assoc-ref outputs "out") "/share/emacs"))))))) (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.") +Atom. To install the emacs specific package, use @code{emacs-merlin}.") (license license:expat))) (define-public ocaml4.07-merlin -- 2.29.2 --=-=-=--