diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 2801a660f312..764ff6e854f4 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -32,18 +32,6 @@ lib.makeScope pkgs.newScope ( ; }; - emacs28 = callPackage (self.sources.emacs28) inheritedArgs; - - emacs28-gtk3 = self.emacs28.override { - withGTK3 = true; - }; - - emacs28-nox = pkgs.lowPrio ( - self.emacs28.override { - noGui = true; - } - ); - emacs29 = callPackage (self.sources.emacs29) inheritedArgs; emacs29-gtk3 = self.emacs29.override { diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 8d682c2ef7f4..3bfaefda164a 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -101,41 +101,6 @@ let }; in { - emacs28 = import ./make-emacs.nix (mkArgs { - pname = "emacs"; - version = "28.2"; - variant = "mainline"; - rev = "28.2"; - hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag="; - patches = fetchpatch: [ - # CVE-2022-45939 - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=d48bb4874bc6cd3e69c7a15fc3c91cc141025c51"; - hash = "sha256-TiBQkexn/eb6+IqJNDqR/Rn7S7LVdHmL/21A5tGsyJs="; - }) - - # https://lists.gnu.org/archive/html/emacs-devel/2024-03/msg00611.html - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/10_all_org-macro-eval.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; - hash = "sha256-OdGt4e9JGjWJPkfJhbYsmQQc6jart4BH5aIKPIbWKFs="; - }) - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/11_all_untrusted-content.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; - hash = "sha256-wa2bsnCt5yFx0+RAFZGBPI+OoKkbrfkkMer/KBEc/wA="; - }) - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/28.2/12_all_org-remote-unsafe.patch?id=af40e12cb742510e5d40a06ffc6dfca97e340dd6"; - hash = "sha256-b6WU1o3PfDV/6BTPfPNUFny6oERJCNsDrvflxX3Yvek="; - }) - - # security fix from Emacs 29.4 - (fetchpatch { - url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=c645e1d8205f0f0663ec4a2d27575b238c646c7c"; - hash = "sha256-G+gGQx5w3KuWMotR1n/sYYL8WyAABYW3fUPeffMMs38="; - }) - ]; - }); - emacs29 = import ./make-emacs.nix (mkArgs { pname = "emacs"; version = "29.4"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 23850496a5a5..1d4a0001c0ea 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -412,12 +412,15 @@ mapAliases { elixir_ls = elixir-ls; # Added 2023-03-20 # Emacs + emacs28 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 emacs28-gtk2 = throw "emacs28-gtk2 was removed because GTK2 is EOL; migrate to emacs28{,-gtk3,-nox} or to more recent versions of Emacs."; # Added 2024-09-20 + emacs28-gtk3 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 + emacs28-nox = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 emacs28NativeComp = emacs28; # Added 2022-06-08 emacs28Packages = throw "'emacs28Packages' has been renamed to/replaced by 'emacs28.pkgs'"; # Converted to throw 2024-10-17 emacs28WithPackages = throw "'emacs28WithPackages' has been renamed to/replaced by 'emacs28.pkgs.withPackages'"; # Converted to throw 2024-10-17 emacsMacport = emacs-macport; # Added 2023-08-10 - emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 + emacsNativeComp = emacs; # Added 2022-06-08 emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17 emacsPackages = emacs.pkgs; # Added 2025-03-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30a56d60470e..29a49b95a9cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13167,10 +13167,6 @@ with pkgs; }; inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) - emacs28 - emacs28-gtk3 - emacs28-nox - emacs29 emacs29-gtk3 emacs29-nox