diff options
author | Vincent Ambo <mail@tazj.in> | 2018-05-31T11·42+0200 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2018-05-31T11·42+0200 |
commit | 59cd0bbd8b76dc886ca4d1e3d6c613d7393a8fd3 (patch) | |
tree | 9bcad14201e933f219112aee5593049a16964d63 /packages.nix | |
parent | 9eb3ce6d74c79ca86e9d1579efd281168c8f4fe2 (diff) |
feat(pkgs): Cherry-pick emacs26 from nixpkgs master
Diffstat (limited to 'packages.nix')
-rw-r--r-- | packages.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/packages.nix b/packages.nix index 872f273284c2..a0163eedc708 100644 --- a/packages.nix +++ b/packages.nix @@ -26,6 +26,12 @@ let rev = "5da85431fb1df4fb3ac36730b2591ccc9bdf5c21"; sha256 = "0pc15wh5al9dmhcj29gwqir3wzpyk2nrplibr5xjk2bdvw6sv6c1"; }; + + # Temporarily import a commit from master directly to pick emacs26. + # Should be removed once that update is in nixos-unstable. + master = import (fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/288ce0cb845c03fafa1f3c673440e9922f22131a.tar.gz"; + }) {}; in { # Configure the Nix package manager nixpkgs = { @@ -38,6 +44,7 @@ in { kontemplate = unstable.kontemplate; mq-cli = unstable.mq-cli; + emacs = master.emacs; # Override various Emacs packages from unstable: pinnedEmacs = with unstable.emacsPackagesNg; { |