about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorAnderson Torres <torres.anderson.85@protonmail.com>2023-05-28 20:45:29 -0300
committerAnderson Torres <torres.anderson.85@protonmail.com>2023-05-29 22:23:52 -0300
commit3d43f48a93c0b9ba6981c8533e92b816fd9ee6a7 (patch)
treef5d192250db23f51cd43dab31f485de625d55ad3 /pkgs/applications
parentc4e48ded591c380c3c5b9b15077fe31263c0870a (diff)
downloadnixlib-3d43f48a93c0b9ba6981c8533e92b816fd9ee6a7.tar
nixlib-3d43f48a93c0b9ba6981c8533e92b816fd9ee6a7.tar.gz
nixlib-3d43f48a93c0b9ba6981c8533e92b816fd9ee6a7.tar.bz2
nixlib-3d43f48a93c0b9ba6981c8533e92b816fd9ee6a7.tar.lz
nixlib-3d43f48a93c0b9ba6981c8533e92b816fd9ee6a7.tar.xz
nixlib-3d43f48a93c0b9ba6981c8533e92b816fd9ee6a7.tar.zst
nixlib-3d43f48a93c0b9ba6981c8533e92b816fd9ee6a7.zip
emacs29: init at 20.0.91
Given that Emacs 29 is considered beta, it will not be aliased to `emacs`.
And, given that Emacs 29 ships with Pure GTK feature, why not to make it
available?
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/editors/emacs/default.nix21
-rw-r--r--pkgs/applications/editors/emacs/sources.nix11
2 files changed, 32 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";