Merge pull request #233301 from atorres1985-contrib/emacs-refactor

Emacs refactor

pkgs/applications/editors/emacs/28.nix

@@ -1,4 +0,0 @@
-import ./generic.nix (rec {
-  version = "28.2";
-  sha256 = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";
-})

pkgs/applications/editors/emacs/default.nix

@@ -0,0 +1,65 @@
+{ lib, pkgs }:
+
+lib.makeScope pkgs.newScope (self:
+  let
+    gconf = pkgs.gnome2.GConf;
+    inherit (self) callPackage;
+  in {
+    sources = import ./sources.nix {
+      inherit lib;
+      inherit (pkgs)
+        fetchFromBitbucket
+        fetchFromSavannah;
+    };
+
+    emacs28 = callPackage (self.sources.emacs28) {
+      inherit gconf;
+
+      inherit (pkgs.darwin) sigtool;
+      inherit (pkgs.darwin.apple_sdk.frameworks)
+        AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz
+        QuartzCore WebKit;
+    };
+
+    emacs28-gtk2 = self.emacs28.override {
+      withGTK2 = true;
+    };
+
+    emacs28-gtk3 = self.emacs28.override {
+      withGTK3 = true;
+    };
+
+    emacs28-nox = pkgs.lowPrio (self.emacs28.override {
+      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;
+
+      inherit (pkgs.darwin) sigtool;
+      inherit (pkgs.darwin.apple_sdk.frameworks)
+        AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz
+        QuartzCore WebKit;
+    };
+  })

pkgs/applications/editors/emacs/generic.nix

@@ -1,66 +1,126 @@
-{
+{ pname ? "emacs"
-  version
+, version
-  , sha256
+, versionModifier ? ""
-  , versionModifier ? ""
+, name ? "emacs-${version}${versionModifier}"
-  , pname ? "emacs"
+, variant
-  , name ? "emacs-${version}${versionModifier}"
+, src
-  , patches ? _: [ ]
+, patches ? _: [ ]
-  , macportVersion ? null
 }:
-{ stdenv, llvmPackages_6, lib, fetchurl, fetchpatch, substituteAll, ncurses, libXaw, libXpm
-, Xaw3d, libXcursor,  pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib
-, libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux
-, alsa-lib, cairo, acl, gpm, m17n_lib, libotf
-, sigtool, jansson, harfbuzz, sqlite, nixosTests
-, recurseIntoAttrs, emacsPackagesFor
-, libgccjit, makeWrapper # native-comp params
-, fetchFromSavannah, fetchFromBitbucket
 
-  # macOS dependencies for NS and macPort
+{ lib
-, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
+, stdenv
-, ImageCaptureCore, GSS, ImageIO # These may be optional
+, Xaw3d
+, acl
+, alsa-lib
+, autoreconfHook
+, cairo
+, dbus
+, emacsPackagesFor
+, fetchpatch
+, gconf
+, gettext
+, giflib
+, glib-networking
+, gnutls
+, gpm
+, gsettings-desktop-schemas
+, gtk2-x11
+, gtk3
+, gtk3-x11
+, harfbuzz
+, imagemagick
+, jansson
+, libXaw
+, libXcursor
+, libXft
+, libXpm
+, libgccjit
+, libjpeg
+, libotf
+, libpng
+, librsvg
+, libselinux
+, libtiff
+, libwebp
+, libxml2
+, llvmPackages_6
+, m17n_lib
+, makeWrapper
+, motif
+, ncurses
+, nixosTests
+, pkg-config
+, recurseIntoAttrs
+, sigtool
+, sqlite
+, substituteAll
+, systemd
+, tree-sitter
+, texinfo
+, webkitgtk
+, wrapGAppsHook
 
-, withX ? !stdenv.isDarwin && !withPgtk
+# macOS dependencies for NS and macPort
-, withNS ? stdenv.isDarwin && !withMacport
+, AppKit
-, withMacport ? macportVersion != null
+, Carbon
-, withGTK2 ? false, gtk2-x11 ? null
+, Cocoa
-, withGTK3 ? withPgtk, gtk3-x11 ? null, gsettings-desktop-schemas ? null
+, GSS
-, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null
+, IOKit
-, withMotif ? false, motif ? null
+, ImageCaptureCore
-, withSQLite3 ? false
+, ImageIO
-, withCsrc ? true
+, OSAKit
-, withWebP ? false
+, Quartz
-, srcRepo ? true, autoreconfHook ? null, texinfo ? null
+, QuartzCore
-, siteStart ? ./site-start.el
+, WebKit
+
+# Boolean flags
 , nativeComp ? true
+, noGui ? false
+, srcRepo ? true
+, withAcl ? false
+, withAlsaLib ? false
 , withAthena ? false
-, withToolkitScrollBars ? true
+, withCsrc ? true
-, withPgtk ? false, gtk3 ? null
+, withGTK2 ? false
-, withXinput2 ? withX && lib.versionAtLeast version "29"
+, withGTK3 ? withPgtk && !noGui
+, withGconf ? false
+, withGpm ? stdenv.isLinux
 , withImageMagick ? lib.versionOlder version "27" && (withX || withNS)
+, withMotif ? false
+, withNS ? stdenv.isDarwin && !(variant == "macport" || noGui)
+, withPgtk ? false
+, withSQLite3 ? false
+, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
+, withToolkitScrollBars ? true
+, withTreeSitter ? lib.versionAtLeast version "29"
+, withWebP ? false
+, withX ? !(stdenv.isDarwin || noGui || withPgtk)
+, withXinput2 ? withX && lib.versionAtLeast version "29"
+, withXwidgets ? false
+
+# Options
+, siteStart ? ./site-start.el
 , toolkit ? (
   if withGTK2 then "gtk2"
   else if withGTK3 then "gtk3"
   else if withMotif then "motif"
   else if withAthena then "athena"
   else "lucid")
-, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
-, withTreeSitter ? lib.versionAtLeast version "29", tree-sitter ? null
 }:
 
-assert (libXft != null) -> libpng != null;      # probably a bug
+assert (withGTK2 && !withNS && variant != "macport") -> withX;
-assert stdenv.isDarwin -> libXaw != null;       # fails to link otherwise
+assert (withGTK3 && !withNS && variant != "macport") -> withX || withPgtk;
-assert withNS -> !withX;
-assert withNS -> stdenv.isDarwin;
-assert withMacport -> !withNS;
-assert (withGTK2 && !withNS && !withMacport) -> withX;
-assert (withGTK3 && !withNS && !withMacport) -> withX || withPgtk;
-assert withGTK2 -> !withGTK3 && gtk2-x11 != null && !withPgtk;
-assert withGTK3 -> !withGTK2 && ((gtk3-x11 != null) || withPgtk);
-assert withPgtk -> withGTK3 && !withX && gtk3 != null;
-assert withXwidgets -> withGTK3 && webkitgtk != null;
-assert withTreeSitter -> tree-sitter != null;
 
+assert noGui -> !(withX || withGTK2 || withGTK3 || withNS || variant == "macport");
+assert withAcl -> stdenv.isLinux;
+assert withAlsaLib -> stdenv.isLinux;
+assert withGTK2 -> !(withGTK3 || withPgtk);
+assert withGTK3 -> !withGTK2 || withPgtk;
+assert withGconf -> withX;
+assert withGpm -> stdenv.isLinux;
+assert withNS -> stdenv.isDarwin && !(withX || variant == "macport");
+assert withPgtk -> withGTK3 && !withX;
+assert withXwidgets -> withGTK3;
 
 let
   libGccJitLibraryPaths = [
@@ -69,14 +129,27 @@ let
   ] ++ lib.optionals (stdenv.cc?cc.libgcc) [
     "${lib.getLib stdenv.cc.cc.libgcc}/lib"
   ];
+
+  inherit (if variant == "macport"
+           then llvmPackages_6.stdenv
+           else stdenv) mkDerivation;
 in
-(if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
+mkDerivation (finalAttrs: (lib.optionalAttrs nativeComp {
-  NATIVE_FULL_AOT = "1";
+  env = {
-  LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths;
+    NATIVE_FULL_AOT = "1";
+    LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths;
+  };
 } // {
-  pname = pname + lib.optionalString ( !withX && !withNS && !withMacport && !withGTK2 && !withGTK3 ) "-nox";
+  pname = pname
+          + (if noGui then "-nox"
+             else if withPgtk then "-pgtk"
+             else if withGTK3 then "-gtk3"
+             else if withGTK2 then "-gtk2"
+             else "");
   inherit version;
 
+  inherit src;
+
   patches = patches fetchpatch ++ lib.optionals nativeComp [
     (substituteAll {
       src = if lib.versionOlder finalAttrs.version "29"
@@ -95,27 +168,14 @@ in
     })
   ];
 
-  src = if macportVersion != null then fetchFromBitbucket {
-    owner = "mituharu";
-    repo = "emacs-mac";
-    rev = macportVersion;
-    inherit sha256;
-  } else fetchFromSavannah {
-    repo = "emacs";
-    rev = version;
-    inherit sha256;
-  };
-
-  enableParallelBuilding = true;
-
   postPatch = lib.concatStringsSep "\n" [
     (lib.optionalString srcRepo ''
       rm -fr .git
     '')
 
     # Add the name of the wrapped gvfsd
-    # This used to be carried as a patch but it often got out of sync with upstream
+    # This used to be carried as a patch but it often got out of sync with
-    # and was hard to maintain for emacs-overlay.
+    # upstream and was hard to maintain for emacs-overlay.
     (lib.concatStrings (map (fn: ''
       sed -i 's#(${fn} "gvfs-fuse-daemon")#(${fn} "gvfs-fuse-daemon") (${fn} ".gvfsd-fuse-wrapped")#' lisp/net/tramp-gvfs.el
     '') [
@@ -130,81 +190,150 @@ in
     ''
 
     ''
-    substituteInPlace lisp/international/mule-cmds.el \
+      substituteInPlace lisp/international/mule-cmds.el \
-      --replace /usr/share/locale ${gettext}/share/locale
+        --replace /usr/share/locale ${gettext}/share/locale
 
-    for makefile_in in $(find . -name Makefile.in -print); do
+      for makefile_in in $(find . -name Makefile.in -print); do
-      substituteInPlace $makefile_in --replace /bin/pwd pwd
+        substituteInPlace $makefile_in --replace /bin/pwd pwd
-    done
+      done
     ''
 
     ""
   ];
 
-  nativeBuildInputs = [ pkg-config makeWrapper ]
+  nativeBuildInputs = [
-    ++ lib.optionals (srcRepo || withMacport) [ texinfo ]
+    makeWrapper
-    ++ lib.optionals srcRepo [ autoreconfHook ]
+    pkg-config
-    ++ lib.optional (withPgtk || withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
+  ] ++ lib.optionals (variant == "macport") [
+    texinfo
+  ] ++ lib.optionals srcRepo [
+    autoreconfHook
+    texinfo
+  ] ++ lib.optional (withPgtk || withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
 
-  buildInputs =
+  buildInputs = [
-    [ ncurses gconf libxml2 gnutls gettext jansson harfbuzz.dev ]
+    gettext
-    ++ lib.optionals stdenv.isLinux [ dbus libselinux alsa-lib acl gpm ]
+    gnutls
-    ++ lib.optionals withSystemd [ systemd ]
+    harfbuzz.dev
-    ++ lib.optionals withX
+    jansson
-      [ libXaw Xaw3d gconf cairo ]
+    libxml2
-    ++ lib.optionals (withX || withPgtk)
+    ncurses
-      [ libXpm libpng libjpeg giflib libtiff ]
+  ] ++ lib.optionals withGconf [
-    ++ lib.optionals (withX || withNS || withPgtk ) [ librsvg ]
+    gconf
-    ++ lib.optionals withImageMagick [ imagemagick ]
+  ] ++ lib.optionals withAcl [
-    ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ]
+    acl
-    ++ lib.optional (withX && withGTK2) gtk2-x11
+  ] ++ lib.optionals withAlsaLib [
-    ++ lib.optional (withX && withGTK3) gtk3-x11
+    alsa-lib
-    ++ lib.optional (!stdenv.isDarwin && withGTK3) gsettings-desktop-schemas
+  ] ++ lib.optionals withGpm [
-    ++ lib.optional withPgtk gtk3
+    gpm
-    ++ lib.optional (withX && withMotif) motif
+  ] ++ lib.optionals stdenv.isLinux [
-    ++ lib.optional withSQLite3 sqlite
+    dbus
-    ++ lib.optional withWebP libwebp
+    libselinux
-    ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ]
+  ] ++ lib.optionals (!stdenv.isDarwin && withGTK3) [
-    ++ lib.optionals withNS [ AppKit GSS ImageIO ]
+    gsettings-desktop-schemas
-    ++ lib.optionals withMacport [
+  ] ++ lib.optionals (stdenv.isLinux && withX) [
-      AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
+    libotf
-      # TODO are these optional?
+    m17n_lib
-      ImageCaptureCore GSS ImageIO
+  ] ++ lib.optionals (withX && withGTK2) [
-    ]
+    gtk2-x11
-    ++ lib.optionals stdenv.isDarwin [ sigtool ]
+  ] ++ lib.optionals (withX && withGTK3) [
-    ++ lib.optionals nativeComp [ libgccjit ]
+    gtk3-x11
-    ++ lib.optionals withTreeSitter [ tree-sitter ];
+  ] ++ lib.optionals (withX && withMotif) [
+    motif
+  ] ++ lib.optionals (withX && withXwidgets) [
+    glib-networking
+    webkitgtk
+  ] ++ lib.optionals nativeComp [
+    libgccjit
+  ] ++ lib.optionals withImageMagick [
+    imagemagick
+  ] ++ lib.optionals withPgtk [
+    giflib
+    gtk3
+    libXpm
+    libjpeg
+    libpng
+    librsvg
+    libtiff
+  ] ++ lib.optionals withSQLite3 [
+    sqlite
+  ] ++ lib.optionals withSystemd [
+    systemd
+  ] ++ lib.optionals withTreeSitter [
+    tree-sitter
+  ] ++ lib.optionals withWebP [
+    libwebp
+  ] ++ lib.optionals withX [
+    Xaw3d
+    cairo
+
+    giflib
+    libXaw
+    libXpm
+    libjpeg
+    libpng
+    librsvg
+    libtiff
+  ] ++ lib.optionals stdenv.isDarwin [
+    sigtool
+  ] ++ lib.optionals withNS [
+    librsvg
+    AppKit
+    GSS
+    ImageIO
+  ] ++ lib.optionals (variant == "macport") [
+    AppKit
+    Carbon
+    Cocoa
+    IOKit
+    OSAKit
+    Quartz
+    QuartzCore
+    WebKit
+    # TODO are these optional?
+    GSS
+    ImageCaptureCore
+    ImageIO
+  ];
 
   hardeningDisable = [ "format" ];
 
   configureFlags = [
     "--disable-build-details" # for a (more) reproducible build
     "--with-modules"
-  ] ++
+  ] ++ (if withNS then [
-    (lib.optional stdenv.isDarwin
+    "--disable-ns-self-contained"
-      (lib.withFeature withNS "ns")) ++
+  ] else if withX then [
-    (if withNS
+    "--with-x-toolkit=${toolkit}"
-      then [ "--disable-ns-self-contained" ]
+    "--with-xft"
-    else if withX
+    "--with-cairo"
-      then [ "--with-x-toolkit=${toolkit}" "--with-xft" "--with-cairo" ]
+  ] else if withPgtk then [
-    else if withPgtk
+    "--with-pgtk"
-      then [ "--with-pgtk" ]
+  ] else [
-    else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
+    "--with-gif=no"
-           "--with-gif=no" "--with-tiff=no" ])
+    "--with-jpeg=no"
-    ++ lib.optionals withMacport [
+    "--with-png=no"
-      "--with-mac"
+    "--with-tiff=no"
-      "--enable-mac-app=$$out/Applications"
+    "--with-x=no"
-      "--with-xml2=yes"
+    "--with-xpm=no"
-      "--with-gnutls=yes"
+  ])
-    ]
+  ++ lib.optionals (variant == "macport") [
-    ++ lib.optional withXwidgets "--with-xwidgets"
+    "--enable-mac-app=$$out/Applications"
-    ++ lib.optional nativeComp "--with-native-compilation"
+    "--with-gnutls=yes"
-    ++ lib.optional withImageMagick "--with-imagemagick"
+    "--with-mac"
-    ++ lib.optional withXinput2 "--with-xinput2"
+    "--with-xml2=yes"
-    ++ lib.optional (!withToolkitScrollBars) "--without-toolkit-scroll-bars"
+  ]
-    ++ lib.optional withTreeSitter "--with-tree-sitter"
+  ++ (lib.optional stdenv.isDarwin (lib.withFeature withNS "ns"))
+  ++ lib.optional (!withToolkitScrollBars) "--without-toolkit-scroll-bars"
+  ++ lib.optional nativeComp "--with-native-compilation"
+  ++ lib.optional withImageMagick "--with-imagemagick"
+  ++ lib.optional withTreeSitter "--with-tree-sitter"
+  ++ lib.optional withXinput2 "--with-xinput2"
+  ++ lib.optional withXwidgets "--with-xwidgets"
   ;
 
+  enableParallelBuilding = true;
+
   installTargets = [ "tags" "install" ];
 
   postInstall = ''
@@ -227,7 +356,7 @@ in
   '' + lib.optionalString withNS ''
     mkdir -p $out/Applications
     mv nextstep/Emacs.app $out/Applications
-  '' + lib.optionalString (nativeComp && (withNS || withMacport)) ''
+  '' + lib.optionalString (nativeComp && (withNS || variant == "macport")) ''
     ln -snf $out/lib/emacs/*/native-lisp $out/Applications/Emacs.app/Contents/native-lisp
   '' + lib.optionalString nativeComp ''
     echo "Generating native-compiled trampolines..."
@@ -256,29 +385,44 @@ in
     tests = { inherit (nixosTests) emacs-daemon; };
   };
 
-  meta = with lib; {
+  meta = {
-    description = "The extensible, customizable GNU text editor" + optionalString withMacport " with Mitsuharu Yamamoto's macport patches";
+    homepage = if variant == "macport"
-    homepage    = if withMacport then "https://bitbucket.org/mituharu/emacs-mac/" else "https://www.gnu.org/software/emacs/";
+               then "https://bitbucket.org/mituharu/emacs-mac/"
-    license     = licenses.gpl3Plus;
+               else "https://www.gnu.org/software/emacs/";
-    maintainers = with maintainers; [ lovek323 jwiegley adisbladis matthewbauer atemu ];
+    description = "The extensible, customizable GNU text editor"
-    platforms   = if withMacport then platforms.darwin else platforms.all;
+                  + lib.optionalString (variant == "macport") " - with macport patches";
-    broken      = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
-
     longDescription = ''
-      GNU Emacs is an extensible, customizable text editor—and more.  At its
+      GNU Emacs is an extensible, customizable text editor—and more. At its
-      core is an interpreter for Emacs Lisp, a dialect of the Lisp
+      core is an interpreter for Emacs Lisp, a dialect of the Lisp programming
-      programming language with extensions to support text editing.
+      language with extensions to support text editing.
 
       The features of GNU Emacs include: content-sensitive editing modes,
       including syntax coloring, for a wide variety of file types including
       plain text, source code, and HTML; complete built-in documentation,
       including a tutorial for new users; full Unicode support for nearly all
-      human languages and their scripts; highly customizable, using Emacs
+      human languages and their scripts; highly customizable, using Emacs Lisp
-      Lisp code or a graphical interface; a large number of extensions that
+      code or a graphical interface; a large number of extensions that add other
-      add other functionality, including a project planner, mail and news
+      functionality, including a project planner, mail and news reader, debugger
-      reader, debugger interface, calendar, and more.  Many of these
+      interface, calendar, and more. Many of these extensions are distributed
-      extensions are distributed with GNU Emacs; others are available
+      with GNU Emacs; others are available separately.
-      separately.
+    ''
+    + lib.optionalString (variant == "macport") ''
+
+      This release is built from Mitsuharu Yamamoto's patched, MacOS X-specific
+      source code.
     '';
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      AndersonTorres
+      adisbladis
+      atemu
+      jwiegley
+      lovek323
+      matthewbauer
+    ];
+    platforms = if variant == "macport"
+                then lib.platforms.darwin
+                else lib.platforms.all;
+    broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
   };
 }))

pkgs/applications/editors/emacs/macport.nix

@@ -1,6 +0,0 @@
-import ./generic.nix rec {
-  pname = "emacs-mac";
-  version = "28.2";
-  macportVersion = "emacs-${version}-mac-9.1";
-  sha256 = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE=";
-}

pkgs/applications/editors/emacs/sources.nix

@@ -0,0 +1,40 @@
+{ lib
+, fetchFromBitbucket
+, fetchFromSavannah
+}:
+
+{
+  emacs28 = import ./generic.nix {
+    pname = "emacs";
+    version = "28.2";
+    variant = "mainline";
+    src = fetchFromSavannah {
+      repo = "emacs";
+      rev = "28.2";
+      hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";
+    };
+  };
+
+  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";
+    variant = "macport";
+    src = fetchFromBitbucket {
+      owner = "mituharu";
+      repo = "emacs-mac";
+      rev = "emacs-28.2-mac-9.1";
+      hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE=";
+    };
+  };
+}

pkgs/top-level/all-packages.nix

@@ -30222,45 +30222,23 @@ with pkgs;
 
   em = callPackage ../applications/editors/em { };
 
+  inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { }))
+    emacs28
+    emacs28-gtk2
+    emacs28-gtk3
+    emacs28-nox
+    emacs29
+    emacs29-gtk3
+    emacs29-nox
+    emacs29-pgtk
+    emacs-macport
+  ;
+
+  emacsMacport = emacs-macport;
   emacs = emacs28;
-  emacs-gtk = emacs28-gtk;
+  emacs-gtk = emacs28-gtk3;
   emacs-nox = emacs28-nox;
 
-  emacs28 = callPackage ../applications/editors/emacs/28.nix {
-    # use override to enable additional features
-    libXaw = xorg.libXaw;
-    gconf = null;
-    alsa-lib = null;
-    acl = null;
-    gpm = null;
-    inherit (darwin.apple_sdk.frameworks)
-      AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
-      ImageCaptureCore GSS ImageIO;
-    inherit (darwin) sigtool;
-  };
-
-  emacs28-gtk = emacs28.override {
-    withGTK3 = true;
-  };
-
-  emacs28-nox = lowPrio (emacs28.override {
-    withX = false;
-    withNS = false;
-    withGTK2 = false;
-    withGTK3 = false;
-  });
-
-  emacsMacport = callPackage ../applications/editors/emacs/macport.nix {
-    withMacport = true;
-
-    gconf = null;
-
-    inherit (darwin.apple_sdk.frameworks)
-      AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
-      ImageCaptureCore GSS ImageIO;
-    inherit (darwin) sigtool;
-  };
-
   emacsPackagesFor = emacs: import ./emacs-packages.nix {
     inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs;
     emacs' = emacs;