Moving from Emacs 29 to master

This commit is contained in:
Andrea Ciceri 2024-02-09 11:54:20 +01:00
parent 237dd37096
commit c01990ee02
Signed by: aciceri
SSH key fingerprint: SHA256:/AagBweyV4Hlfg9u092n8hbHwD5fcB6A3qhDiDA65Rg
2 changed files with 3 additions and 4 deletions

View file

@ -27,9 +27,7 @@
flake = false;
};
extra-package-copilot = {
# TODO remove rev when jsonrpc 1.0.23 hits emacs 29
# https://github.com/copilot-emacs/copilot.el/issues/232
url = "github:zerolfx/copilot.el/1542d76909636bf8804dd9c770f28818a897cfdc";
url = "github:zerolfx/copilot.el";
flake = false;
};
extra-package-notmuch-notify = {

View file

@ -20,6 +20,7 @@
}) (lib.filterAttrs (inputName: _: ! builtins.isNull (builtins.match "extra-package-.*" inputName)) inputs);
})
inputs.emacs-overlay.overlays.package
inputs.emacs-overlay.overlays.emacs
# Some tree-sitter grammars in nixpksg are built with a too new ABI
# https://github.com/NixOS/nixpkgs/issues/209114
# (_: _: {
@ -48,7 +49,7 @@
cp $f $out/"libtree-sitter-$(basename $f)"
done
'';
ccrEmacsWithoutPackages = pkgs.emacs29.override {
ccrEmacsWithoutPackages = pkgs.emacs-git.override {
withSQLite3 = true;
withWebP = true;
withPgtk = true;