about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-08-24T16·26+0300
committertazjin <mail@tazj.in>2021-08-24T17·11+0000
commit94e8e06c6c2ed38f5023d59f84ed06d8d4b67919 (patch)
tree187c3f19277d3daf24e7a5edd342086b86f2e28e
parent3555df018f56935df1cab56af038c3a2556da7f4 (diff)
fix(tazjin/emacs): Remove temporary override for telega r/2760
The channel has caught up with this fix.

Change-Id: I86287a6808e6936e50e5d43cbafc74b9362e0bd8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3404
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
-rw-r--r--third_party/emacs/telega.nix6
-rw-r--r--users/tazjin/emacs/default.nix3
2 files changed, 1 insertions, 8 deletions
diff --git a/third_party/emacs/telega.nix b/third_party/emacs/telega.nix
deleted file mode 100644
index a4c034b24224..000000000000
--- a/third_party/emacs/telega.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-# Temporary fix for unstable telega that tries to build with a broken patch.
-{ pkgs, ... }:
-
-pkgs.emacsPackages.melpaPackages.telega.overrideAttrs(old: {
-  patches = [];
-})
diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index 3ddae4fa6afb..f094600ebf19 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -14,7 +14,7 @@ let
   emacsWithPackages = (pkgs.emacsPackagesGen emacs).emacsWithPackages;
 
   # $PATH for binaries that need to be available to Emacs
-  emacsBinPath = lib.makeBinPath [ pkgs.emacsPackages.tvlPackages.telega ];
+  emacsBinPath = lib.makeBinPath [ pkgs.emacsPackages.telega ];
 
   identity = x: x;
 
@@ -110,7 +110,6 @@ let
 
     # patched / overridden versions of packages
     rcirc
-    telega
   ]))));
 in lib.fix(self: l: f: pkgs.writeShellScriptBin "tazjins-emacs" ''
   export PATH="${emacsBinPath}:$PATH"