From 8b2d0ae064e294fc2409dea0e36cc7ed5b6fd3a3 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 14 Aug 2020 14:19:46 +0100 Subject: [PATCH] refactor(tazjin/emacs): Use telega.el from unstable channel This removes the need for supplying a locally built telega-server binary, as the new upstream derivation includes this. It also ensures that the frontend/backend are synchronised, which I think has been causing some issues on vauxhall. Change-Id: If504624e607a24fa12d68516cde65fef25ed2838 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1749 Tested-by: BuildkiteCI Reviewed-by: tazjin --- users/tazjin/emacs/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix index 8de4660bc..5bb9a720a 100644 --- a/users/tazjin/emacs/default.nix +++ b/users/tazjin/emacs/default.nix @@ -14,8 +14,12 @@ let emacsWithPackages = (third_party.emacsPackagesGen third_party.emacs26).emacsWithPackages; + # Pick telega from unstable channel for recent fixes. + unstable = import third_party.nixpkgsSrc {}; + telegaUnstable = (unstable.emacsPackagesGen third_party.emacs26).telega; + # $PATH for binaries that need to be available to Emacs - emacsBinPath = lib.makeBinPath [ third_party.telega ]; + emacsBinPath = lib.makeBinPath [ telegaUnstable ]; identity = x: x; @@ -34,6 +38,7 @@ let # MELPA packages: (with epkgs.melpaPackages; [ ace-link + bazel-mode browse-kill-ring cargo clojure-mode @@ -86,7 +91,7 @@ let sly string-edit swiper - telega + telegaUnstable telephone-line terraform-mode toml-mode