aciceri/emacs
Archived
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Moving from Emacs 29 to master

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flake.nix
View file

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

3
packages/default.nix
View file

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