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 eKZXFu5j7l/zZgAA0tVLHw (envelope-from ) for ; Thu, 31 Dec 2020 23:51: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 mp1 with LMTPS id wG8OEu5j7l/DXgAAbx9fmQ (envelope-from ) for ; Thu, 31 Dec 2020 23:51: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 AF251940149 for ; Thu, 31 Dec 2020 23:51:09 +0000 (UTC) Received: from localhost ([::1]:37836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kv7im-0002O4-KP for larch@yhetil.org; Thu, 31 Dec 2020 18:51:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kv7ig-0002Ny-GX for guix-patches@gnu.org; Thu, 31 Dec 2020 18:51:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58578) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kv7ig-0001xU-9G for guix-patches@gnu.org; Thu, 31 Dec 2020 18:51:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kv7ig-00044f-5K for guix-patches@gnu.org; Thu, 31 Dec 2020 18:51: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 23:51: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: Julien Lepiller Received: via spool by 45575-submit@debbugs.gnu.org id=B45575.160945865715649 (code B ref 45575); Thu, 31 Dec 2020 23:51:02 +0000 Received: (at 45575) by debbugs.gnu.org; 31 Dec 2020 23:50:57 +0000 Received: from localhost ([127.0.0.1]:41891 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv7ia-00044K-Oa for submit@debbugs.gnu.org; Thu, 31 Dec 2020 18:50:57 -0500 Received: from mail-pg1-f177.google.com ([209.85.215.177]:45670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kv7iY-000446-1b for 45575@debbugs.gnu.org; Thu, 31 Dec 2020 18:50:55 -0500 Received: by mail-pg1-f177.google.com with SMTP id v19so13759167pgj.12 for <45575@debbugs.gnu.org>; Thu, 31 Dec 2020 15:50:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=asu-edu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=V8CDsHUv3H0Zqi8wIJFC5vXZTQg5/PT1siVxuVfh/mA=; b=SkkEW55DcWMaXA8WJfO0d+VwqzOUKItR80ezds3geH/tk4mCd1W5Zwbl7HesrzeAAA 9nR6pxX0LXEdr2DsqDmj2kjQF90mS3dBxoj9e8RjpMYPyo9icGCss9DtDLMfoDTgFHny XOgZR64HT/++vN2LeD9Ij0SMJF3vIoLeJPZTiN43QE/xBbYa4WL6Gvsf91sZX/01cHRG bACfAsCNqdtXu5u9otziFpAo3BmdTQwivLbKGfVuzf7WDQJJRZqmkkOlhiaJP/1Fdbq7 C0lF0rVJxRGHnC+oi5r1UNcY/dEUKJYHFvzXTFGpwlg5JIm/VoN7T9panH2EMKkCq8n1 8liQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=V8CDsHUv3H0Zqi8wIJFC5vXZTQg5/PT1siVxuVfh/mA=; b=qxH8b3EbNxMBF1OBFkF8vYatib6JUzzcXFIEooDd3vOUN5EdFBixBsvXQO+sJEW+A2 /cLIdsZ8IT+GSsvApQxK1n0X8fj1ikOXqSbV+fvTnxZsNf1I5McJzdVNnyd57afhwXtY JVLBJJmw/ekkWwJY2a48FcSdqLWQO38bWbMGXp4LcjQh4IOFuEtDDs7UEHvuAXTaWUsk ojn8Raye4+cRSs6UlFsK+d3BbQ+884gzdC2apRXnYQVEz/wmQxnEjCsl4SkNcKklsvTV bDkZt83HaYxqWXKjmKA/rS810JiOMugU9T2RNoQlSkI4XFCaA0JOFW9vhCUoKi6jCO1A sZ1Q== X-Gm-Message-State: AOAM5329j3fmbuOIEuxVKxpHq/dc8zYdgVW0wZNOL/L1xNupleImLuYV ltaeDOtiTPnDKIKZ5KOQ0MTCX+yfQCk7IQ== X-Google-Smtp-Source: ABdhPJzCpJBDVMOLjgIIEE5A3X5uj1oQNQczW2P7vOSLmSCkiB4wlvSILTl2M5VhS3+L6SIULdql1A== X-Received: by 2002:a63:574c:: with SMTP id h12mr54519861pgm.79.1609458647768; Thu, 31 Dec 2020 15:50:47 -0800 (PST) Received: from ecenter ([2600:1700:83b0:8bd0::7a8]) by smtp.gmail.com with ESMTPSA id b72sm46193563pfb.129.2020.12.31.15.50.46 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Dec 2020 15:50:47 -0800 (PST) From: John Soo References: <87eej54upy.fsf@asu.edu> <20201231233242.1a367ae3@tachikoma.lepiller.eu> Date: Thu, 31 Dec 2020 15:50:45 -0800 In-Reply-To: <20201231233242.1a367ae3@tachikoma.lepiller.eu> (Julien Lepiller's message of "Thu, 31 Dec 2020 23:32:42 +0100") Message-ID: <8735zl4jsa.fsf_-_@asu.edu> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) 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: , Cc: 45575@debbugs.gnu.org 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=SkkEW55D; 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: AF251940149 X-Spam-Score: -1.23 X-Migadu-Scanner: scn0.migadu.com X-TUID: feXkoiqr3ebS --=-=-= Content-Type: text/plain Hi Julien, Julien Lepiller writes: > thanks for the patches! I have pushed a series of patches from > Pukkamustard a few days ago that already add ocaml-merlin for the > latest OCaml compiler. Could you rebase your patches on master and > check if any of your patches is still relevant? Oops! I have too many unmerged patches and rebasing is getting to be a chore. ocaml-merlin on master looks good to me. The only thing I would like to see is the emacs-merlin package. Having emacs-merlin as a package is nice because it takes advantage of the guix autoload machinery. Here's a rebased patch. I understand if it needs more thought. Thanks a lot! - John --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-Add-emacs-merlin.patch >From f9b6926c9e15780aab978dabc7fd6f65365200cb 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 | 19 ++++++++++++++----- 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2f8bc1c7f2..b49106dfa3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -137,6 +137,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) @@ -668,6 +669,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 2df16e7cd2..71a3a870e6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3951,22 +3951,31 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") (base32 "0i2nwkdh6cfzmnsdsr8aw86vs8j1k5jkjzrs61b9384wnffdbbmj")))) (build-system dune-build-system) - (arguments '(#:package "merlin" - #:test-target "tests")) + (arguments + `(#:package "merlin" + #: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"))))))) (inputs `(("ocaml-yojson" ,ocaml-yojson) ("ocaml-csexp" ,ocaml-csexp) ("ocaml-result" ,ocaml-result))) (native-inputs - `(("ocaml-dot-merlin-reader" ,ocaml-dot-merlin-reader) ; required for tests - ("ocaml-mdx" ,ocaml-mdx) + `(("ocaml-mdx" ,ocaml-mdx) ("jq" ,jq))) + (propagated-inputs + `(("ocaml-dot-merlin-reader" ,ocaml-dot-merlin-reader))) (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. 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))) ;; ocaml-merlin 3.4.2 can not be built with old version of dune used in -- 2.29.2 --=-=-=--