aynish/helm
1
0
Fork 0
Code Pull requests Packages Projects Releases Activity

Use emacsUnstable overlay instead of mine

Browse source 
Less work for me!
This commit is contained in:
Henrik Lissner 2020-04-12 21:01:45 -04:00
parent 06461716a5
commit 0dc17cc5a5
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/editors/emacs.nix
View file

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

1
packages/default.nix
View file

@ -6,7 +6,6 @@
(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) {});
emacs27 = (callPackage ./emacs27.nix {});
linode-cli = (callPackage ./linode-cli.nix {}); linode-cli = (callPackage ./linode-cli.nix {});
ripcord = (callPackage ./ripcord.nix {}); ripcord = (callPackage ./ripcord.nix {});
zunit = (callPackage ./zunit.nix {}); zunit = (callPackage ./zunit.nix {});

19
packages/emacs27.nix
View file

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