diff options
author | William Carroll <wpcarro@gmail.com> | 2020-09-02T13·05+0100 |
---|---|---|
committer | William Carroll <wpcarro@gmail.com> | 2020-09-02T13·07+0100 |
commit | 9c71c78abcdaa4ce46aaee964494659d5283e5d6 (patch) | |
tree | 200cbbbb6e0073312e43b6e87bcfe4eeaf2b22bd | |
parent | c17796a60dba0c81ffb03ad277063a7eee2e1736 (diff) |
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.
-rw-r--r-- | default.nix | 2 | ||||
-rw-r--r-- | emacs/.emacs.d/wpc/wpc-misc.el | 7 | ||||
-rw-r--r-- | emacs/default.nix | 10 |
3 files changed, 6 insertions, 13 deletions
diff --git a/default.nix b/default.nix index dca6dea16c23..bb8c557cdc81 100644 --- a/default.nix +++ b/default.nix @@ -12,7 +12,7 @@ let depot = import (fetchGit { url = "https://cl.tvl.fyi/depot"; - rev = "a2e86152401c7c531801c79347c3f15e1806aabc"; + rev = "2f7b688389058b454ee12adc4b6b47740298f53b"; }) {}; pkgs = import (fetchGit { diff --git a/emacs/.emacs.d/wpc/wpc-misc.el b/emacs/.emacs.d/wpc/wpc-misc.el index ecaf87128990..c8cc1e1a5d5b 100644 --- a/emacs/.emacs.d/wpc/wpc-misc.el +++ b/emacs/.emacs.d/wpc/wpc-misc.el @@ -295,13 +295,6 @@ :config (paradox-enable)) -;; TODO: Consider supporting a wpc-elisp.el package for Elisp tooling. -;; The following functions are quite useful for Elisp development: -;; - `emr-el-find-unused-definitions' -(use-package emr - :config - (define-key prog-mode-map (kbd "M-RET") #'emr-show-refactor-menu)) - ;; Start the Emacs server (server-start) 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 { |