From c01990ee02bf07f312136f06cd53a97f51c955ad Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Fri, 9 Feb 2024 11:54:20 +0100
Subject: [PATCH] Moving from Emacs `29` to `master`

---
 flake.nix            | 4 +---
 packages/default.nix | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index ae3db9c..5c84900 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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 = {
diff --git a/packages/default.nix b/packages/default.nix
index 2485a8a..a4d9425 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -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;