From 0dc17cc5a5b647608265c4fed564d428ead848b9 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 12 Apr 2020 21:01:45 -0400
Subject: [PATCH] Use emacsUnstable overlay instead of mine

Less work for me!
---
 modules/editors/emacs.nix |  2 +-
 packages/default.nix      |  1 -
 packages/emacs27.nix      | 19 -------------------
 3 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 packages/emacs27.nix

diff --git a/modules/editors/emacs.nix b/modules/editors/emacs.nix
index 5d30988f..4f4d49b4 100644
--- a/modules/editors/emacs.nix
+++ b/modules/editors/emacs.nix
@@ -16,7 +16,7 @@ with lib;
     my = {
       packages = with pkgs; [
         ## Doom dependencies
-        my.emacs27
+        emacsUnstable
         git
         (ripgrep.override {withPCRE2 = true;})
 
diff --git a/packages/default.nix b/packages/default.nix
index f6482300..61f95f0d 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -6,7 +6,6 @@
         (callPackage
           (builtins.fetchTarball
             https://github.com/xzfc/cached-nix-shell/archive/master.tar.gz) {});
-      emacs27 = (callPackage ./emacs27.nix {});
       linode-cli = (callPackage ./linode-cli.nix {});
       ripcord = (callPackage ./ripcord.nix {});
       zunit = (callPackage ./zunit.nix {});
diff --git a/packages/emacs27.nix b/packages/emacs27.nix
deleted file mode 100644
index 1b1e7ead..00000000
--- a/packages/emacs27.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-# https://github.com/nix-community/emacs-overlay is all about Emacs HEAD and
-# pkgs.emacs is all about stable, but I want 27.0.90 with its native JSON
-# library, and none of HEAD's instability, so...
-
-{ stdenv, pkgs, lib, fetchurl, ... }:
-
-pkgs.emacsGit.overrideAttrs (oa: rec {
-  name = "emacs-${version}";
-  version = "27.0.90";
-  src = fetchurl {
-    url = "https://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.xz";
-    sha256 = "1x0z9hfq7n88amd32714g9182nfy5dmz9br0pjqajgq82vjn9qxk";
-  };
-  buildInputs = oa.buildInputs ++ [ pkgs.jansson ];
-  configureFlags = oa.configureFlags ++ [ "--with-jansson" ];
-
-  # Remove tramp-detect-wrapped-gvfsd.patch because it doesn't work with 27.0.90
-  patches = lib.drop 1 oa.patches;
-})