From a25485fad44228e0815f8361319a7c092f11d811 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 29 Jul 2018 16:56:11 +0200 Subject: [PATCH] refactor(emacs): Install eglot & jsonrpc from ELPA instead of Github trust++; --- emacs.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/emacs.nix b/emacs.nix index 7a1689712..cef662403 100644 --- a/emacs.nix +++ b/emacs.nix @@ -25,18 +25,26 @@ nix-mode = emacsPackagesNg.melpaBuild { ''; }; -# The default Rust language server mode is not really usable, install -# `eglot` instead and hope for the best. +jsonrpc = emacsPackagesNg.elpaBuild rec { + pname = "jsonrpc"; + version = "1.0.0"; + + src = fetchurl { + url = "https://elpa.gnu.org/packages/jsonrpc-${version}.el"; + sha256 = "06lmmn7j2ilkvwibbpgnd8p6d63fjjnxd2ma8f4jw6vrz1f7lwvs"; + }; +}; + eglot = emacsPackagesNg.melpaBuild rec { pname = "eglot"; version = "1.1"; - src = fetchFromGitHub { - owner = "joaotavora"; - repo = "eglot"; - rev = version; - sha256 = "0p3fry60xvh7za0p8pyz4h21nzj6df1cbl9lxdzd19rwfd35fzpp"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/eglot-${version}.tar"; + sha256 = "01h4wh87lrd9l50y20gjjkgg760v8ixvbcb3q8jykl29989zw62y"; }; + + packageRequires = [ jsonrpc ]; }; # ivy has not been updated in unstable for a while: