mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tools/emacs): Move third-party overrides to //third_party

Browse source 
EXWM and vterm are overridden, but this shouldn't be happening outside
of //third_party
This commit is contained in:
Vincent Ambo 2020-05-16 04:08:17 +01:00
parent a078cabc71
commit d97cf260a2
3 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
third_party/emacs/exwm.nix vendored Normal file
View file

@ -0,0 +1,13 @@
# 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";
};
})

11
third_party/emacs/vterm.nix vendored Normal file
View file

@ -0,0 +1,11 @@
# Overridden vterm to fetch a newer version
{ pkgs, ... }:
pkgs.emacsPackages.vterm.overrideAttrs(_: {
src = pkgs.fetchFromGitHub{
owner = "akermu";
repo = "emacs-libvterm";
rev = "58b4cc40ee9872a08fc5cbfee78ad0e195a3306c";
sha256 = "1w5yfl8nq4k7xyldf0ivzv36vhz3dwdzk6q2vs3xwpx6ljy52px6";
};
})

26
tools/emacs/default.nix
View file

@ -21,18 +21,6 @@ let
identity = x: x; identity = x: x;
# EXWM straight from GitHub. As of 2020-02-07, XELB in nixpkgs is
# already at a recent enough version and does not need to be
# overridden.
exwmMaster = exwm.overrideAttrs(_: {
src = third_party.fetchFromGitHub {
owner = "ch11ng";
repo = "exwm";
rev = "48db94f48bea1137132345abfe8256cfc6219248";
sha256 = "0jj12z6m5kvanq19gds3jpvid2mg8w28bbbq9iycl751y2sj4l1r";
};
});
tazjinsEmacs = pkgfun: (emacsWithPackages(epkgs: pkgfun( tazjinsEmacs = pkgfun: (emacsWithPackages(epkgs: pkgfun(
# Actual ELPA packages (the enlightened!) # Actual ELPA packages (the enlightened!)
(with epkgs.elpaPackages; [ (with epkgs.elpaPackages; [
@ -111,27 +99,19 @@ let
xelb xelb
yaml-mode yaml-mode
yasnippet yasnippet
(vterm.overrideAttrs(_: {
src = third_party.fetchFromGitHub{
owner = "akermu";
repo = "emacs-libvterm";
rev = "58b4cc40ee9872a08fc5cbfee78ad0e195a3306c";
sha256 = "1w5yfl8nq4k7xyldf0ivzv36vhz3dwdzk6q2vs3xwpx6ljy52px6";
};
}))
]) ++ ]) ++
# Custom packages # Custom packages
(with depot.tools.emacs-pkgs; [ (with depot.tools.emacs-pkgs; [
carp-mode carp-mode
exwmMaster
dottime dottime
nix-util nix-util
term-switcher term-switcher
# patched version of rcirc # patched / overridden versions of packages
depot.third_party.emacs.exwm
depot.third_party.emacs.rcirc depot.third_party.emacs.rcirc
depot.third_party.emacs.vterm
])))); ]))));
in lib.fix(self: l: f: third_party.writeShellScriptBin "tazjins-emacs" '' in lib.fix(self: l: f: third_party.writeShellScriptBin "tazjins-emacs" ''
export PATH="${emacsBinPath}:$PATH" export PATH="${emacsBinPath}:$PATH"