From 0fbd6f0aebc02fbdcbc363dd65c075206fb6fb72 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Mon, 13 Dec 2021 18:53:22 +0300
Subject: fix(tazjin/emacs): Use telega from MELPA

The stable versions are too old to be compatible with nixpkgs-unstable

Change-Id: I8edb125024460f605ff640cd486779877fa0d256
---
 users/tazjin/emacs/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'users/tazjin/emacs/default.nix')

diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index 48805a42f220..a13a697648ee 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -13,8 +13,12 @@ pkgs.makeOverridable({ emacs ? pkgs.emacsGcc }:
 let
   emacsWithPackages = (pkgs.emacsPackagesGen emacs).emacsWithPackages;
 
+  # If switching telega versions, use this variable because it will
+  # keep the version check, binary path and so on in sync.
+  currentTelega = epkgs: epkgs.melpaPackages.telega;
+
   # $PATH for binaries that need to be available to Emacs
-  emacsBinPath = lib.makeBinPath [ pkgs.emacsPackages.telega ];
+  emacsBinPath = lib.makeBinPath [ (currentTelega pkgs.emacsPackages) ];
 
   identity = x: x;
 
@@ -75,7 +79,6 @@ let
     sly
     string-edit
     swiper
-    telega
     telephone-line
     terraform-mode
     toml-mode
@@ -91,6 +94,9 @@ let
     yaml-mode
     yasnippet
 
+    # Wonky stuff
+    (currentTelega epkgs)
+
     # Custom depot packages (either ours, or overridden ones)
     tvlPackages.dottime
     tvlPackages.nix-util
-- 
cgit 1.4.1