5 files changed, 2 insertions, 69 deletions
diff --git a/third_party/emacs/carp-mode.nix b/third_party/emacs/carp-mode.nix
deleted file mode 100644
index 0ddf136542..0000000000
--- a/third_party/emacs/carp-mode.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ pkgs, ... }:
-
-with pkgs;
-with emacsPackages;
-
-melpaBuild rec {
-  pname = "carp-mode";
-  version = "3.0";
-  packageRequires = [ clojure-mode ];
-
-  recipe = builtins.toFile "recipe" ''
-    (carp-mode :fetcher github
-        :repo "carp-lang/carp"
-        :files ("emacs/*.el"))
-  '';
-
-  src = fetchFromGitHub {
-    owner = "carp-lang";
-    repo = "carp";
-    rev = "6954642cadee730885717201c3180c7acfb1bfa9";
-    sha256 = "1pz4x2qkwjbz789bwc6nkacrjpzlxawxhl2nv0xdp731y7q7xyk9";
-  };
-}
diff --git a/third_party/emacs/explain-pause-mode.nix b/third_party/emacs/explain-pause-mode.nix
deleted file mode 100644
index 60e0cd1498..0000000000
--- a/third_party/emacs/explain-pause-mode.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgs, ... }:
-
-let
-  inherit (pkgs) emacsPackages fetchFromGitHub;
-in emacsPackages.melpaBuild {
-  pname = "explain-pause-mode";
-  version = "0.1"; # master on 20200603
-
-  recipe = builtins.toFile "recipe.el" ''
-    (explain-pause-mode :fetcher github
-                        :repo "lastquestion/explain-pause-mode")
-  '';
-
-  src = fetchFromGitHub {
-    owner = "lastquestion";
-    repo = "explain-pause-mode";
-    rev = "35f7d780a9c164b5c502023746473b1de3857904";
-    sha256 = "0d9lwzqqwmz0n94i7959rj7m24265yf3825a5g8cd7fyzxznl1pc";
-  };
-}
diff --git a/third_party/emacs/exwm.nix b/third_party/emacs/exwm.nix
deleted file mode 100644
index 5855205314..0000000000
--- a/third_party/emacs/exwm.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-# EXWM straight from GitHub. As of 2020-05-15, XELB in nixpkgs is
-# already at a recent enough version and does not need to be
-# overridden.
-{ pkgs, ... }:
-
-pkgs.emacsPackages.exwm.overrideAttrs(_: {
-  src = pkgs.fetchFromGitHub {
-    owner = "ch11ng";
-    repo = "exwm";
-    rev = "48db94f48bea1137132345abfe8256cfc6219248";
-    sha256 = "0jj12z6m5kvanq19gds3jpvid2mg8w28bbbq9iycl751y2sj4l1r";
-  };
-})
diff --git a/third_party/emacs/rcirc/default.nix b/third_party/emacs/rcirc/default.nix
index 9d22c7cd86..f34cbed789 100644
--- a/third_party/emacs/rcirc/default.nix
+++ b/third_party/emacs/rcirc/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-pkgs.emacsPackages.trivialBuild rec {
+depot.tools.emacs-pkgs.buildEmacsPackage rec {
   pname = "rcirc";
   version = "1";
   src = ./rcirc.el;
diff --git a/third_party/emacs/vterm.nix b/third_party/emacs/vterm.nix
deleted file mode 100644
index 674a919c99..0000000000
--- a/third_party/emacs/vterm.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# Overridden vterm to fetch a newer version
-{ pkgs, ... }:
-
-pkgs.emacsPackages.vterm.overrideAttrs(_: {
-  src = pkgs.fetchFromGitHub{
-    owner = "akermu";
-    repo = "emacs-libvterm";
-    rev = "58b4cc40ee9872a08fc5cbfee78ad0e195a3306c";
-    sha256 = "1w5yfl8nq4k7xyldf0ivzv36vhz3dwdzk6q2vs3xwpx6ljy52px6";
-  };
-})