From 9c71c78abcdaa4ce46aaee964494659d5283e5d6 Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Wed, 2 Sep 2020 14:05:20 +0100
Subject: Pull Emacs 27 from @tazjin's depot

Here's what happened:

My `emacs.glinux` derivation relies on gLinux `/usr/bin/emacs`, and Google
recently published version 27, so all corporate machines (i.e. this laptop)
switched from Emacs 26 to Emacs 27 overnight.

However, my Nix derivation was building all of the packages for Emacs 26, so
some packages were compatible while others weren't.

The Elisp package, `emr`, doesn't build for version 27, so I dropped it
altogether.
---
 emacs/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'emacs/default.nix')

diff --git a/emacs/default.nix b/emacs/default.nix
index c6b140329972..685a37ec2b59 100644
--- a/emacs/default.nix
+++ b/emacs/default.nix
@@ -1,8 +1,9 @@
-{ pkgs, ... }:
+{ pkgs, depot, ... }:
 
 let
   inherit (builtins) path;
-  inherit (pkgs) emacs26 emacsPackagesNgGen writeShellScript writeShellScriptBin;
+  inherit (depot.third_party) emacsPackagesGen emacs27;
+  inherit (pkgs) writeShellScript writeShellScriptBin;
   inherit (pkgs.lib.strings) makeBinPath;
 
   emacsBinPath = makeBinPath (with pkgs; [
@@ -17,7 +18,7 @@ let
     xorg.xset
   ]);
 
-  emacsWithPackages = (emacsPackagesNgGen emacs26).emacsWithPackages;
+  emacsWithPackages = (emacsPackagesGen emacs27).emacsWithPackages;
 
   wpcarrosEmacs = emacsWithPackages (epkgs:
     (with epkgs.elpaPackages; [
@@ -32,6 +33,7 @@ let
       ts
       vterm
       base16-theme
+      password-store
       ivy-pass
       clipmon # TODO: Prefer an Emacs client for clipmenud.
       protobuf-mode # TODO: Determine if this is coming from google-emacs.
@@ -57,7 +59,6 @@ let
       parsec
       magit-popup
       direnv
-      emr
       ivy-prescient
       all-the-icons
       all-the-icons-ivy
@@ -109,7 +110,6 @@ let
       counsel
       flycheck
       ivy
-      magit
     ]));
 
   vendorDir = path {
-- 
cgit 1.4.1