Replace emacs 26 with 27

This commit is contained in:
Henrik Lissner 2020-03-07 22:10:02 -05:00
parent 187bdbd9fa
commit df1020f559
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 25 additions and 5 deletions

View file

@ -7,7 +7,7 @@
my = { my = {
packages = with pkgs; [ packages = with pkgs; [
## Doom dependencies ## Doom dependencies
emacs my.emacs27
git git
(ripgrep.override {withPCRE2 = true;}) (ripgrep.override {withPCRE2 = true;})

View file

@ -1,14 +1,15 @@
[ [
(self: super: with super; { (self: super: with super; {
my = { my = {
linode-cli = (callPackage ./packages/linode-cli.nix {}); ant-dracula = (callPackage ./packages/ant-dracula.nix {});
ripcord = (callPackage ./packages/ripcord.nix {});
zunit = (callPackage ./packages/zunit.nix {});
cached-nix-shell = cached-nix-shell =
(callPackage (callPackage
(builtins.fetchTarball (builtins.fetchTarball
https://github.com/xzfc/cached-nix-shell/archive/master.tar.gz) {}); https://github.com/xzfc/cached-nix-shell/archive/master.tar.gz) {});
ant-dracula = (callPackage ./packages/ant-dracula.nix {}); emacs27 = (callPackage ./packages/emacs27.nix {});
linode-cli = (callPackage ./packages/linode-cli.nix {});
ripcord = (callPackage ./packages/ripcord.nix {});
zunit = (callPackage ./packages/zunit.nix {});
}; };
nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") { nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {

19
packages/emacs27.nix Normal file
View file

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