3 files changed, 36 insertions, 0 deletions
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index 373570f10fb6..b2edc8597013 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -33,6 +33,27 @@ lib.makeScope pkgs.newScope (self:
       noGui = true;
     });
 
+    emacs29 = callPackage (self.sources.emacs29) {
+      inherit gconf;
+
+      inherit (pkgs.darwin) sigtool;
+      inherit (pkgs.darwin.apple_sdk.frameworks)
+        AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz
+        QuartzCore WebKit;
+    };
+
+    emacs29-gtk3 = self.emacs29.override {
+      withGTK3 = true;
+    };
+
+    emacs29-nox = self.emacs29.override {
+      noGui = true;
+    };
+
+    emacs29-pgtk = self.emacs29.override {
+      withPgtk = true;
+    };
+
     emacs-macport = callPackage (self.sources.emacs-macport) {
       inherit gconf;
 
diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix
index 3e1de723b730..4744456ee434 100644
--- a/pkgs/applications/editors/emacs/sources.nix
+++ b/pkgs/applications/editors/emacs/sources.nix
@@ -15,6 +15,17 @@
     };
   };
 
+  emacs29 = import ./generic.nix {
+    pname = "emacs";
+    version = "29.0.91";
+    variant = "mainline";
+    src = fetchFromSavannah {
+      repo = "emacs";
+      rev = "29.0.91";
+      hash = "sha256-YU/sbIr7xX5ELJtPcTL9ZQgZtjEW5oI7YC20fQsOVSY=";
+    };
+  };
+
   emacs-macport = import ./generic.nix {
     pname = "emacs-mac";
     version = "28.2";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eace74cb5f4a..5ec8de13936b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30213,6 +30213,10 @@ with pkgs;
     emacs28-gtk2
     emacs28-gtk3
     emacs28-nox
+    emacs29
+    emacs29-gtk3
+    emacs29-nox
+    emacs29-pgtk
     emacs-macport
   ;