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.
This commit is contained in:
William Carroll 2020-09-02 14:05:20 +01:00
parent c17796a60d
commit 9c71c78abc
3 changed files with 6 additions and 13 deletions

View file

@ -12,7 +12,7 @@ let
depot = import (fetchGit {
url = "https://cl.tvl.fyi/depot";
rev = "a2e86152401c7c531801c79347c3f15e1806aabc";
rev = "2f7b688389058b454ee12adc4b6b47740298f53b";
}) {};
pkgs = import (fetchGit {

View file

@ -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)

View file

@ -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 {