diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 764ff6e854f4..8640d64786b3 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -32,20 +32,6 @@ lib.makeScope pkgs.newScope ( ; }; - emacs29 = callPackage (self.sources.emacs29) inheritedArgs; - - emacs29-gtk3 = self.emacs29.override { - withGTK3 = true; - }; - - emacs29-nox = self.emacs29.override { - noGui = true; - }; - - emacs29-pgtk = self.emacs29.override { - withPgtk = true; - }; - emacs30 = callPackage (self.sources.emacs30) inheritedArgs; emacs30-gtk3 = self.emacs30.override { diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 3bfaefda164a..85a980f0a355 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -101,14 +101,6 @@ let }; in { - emacs29 = import ./make-emacs.nix (mkArgs { - pname = "emacs"; - version = "29.4"; - variant = "mainline"; - rev = "29.4"; - hash = "sha256-FCP6ySkN9mAdp2T09n6foS2OciqZXc/54guRZ0B4Z2s="; - }); - emacs30 = import ./make-emacs.nix (mkArgs { pname = "emacs"; version = "30.1"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1d4a0001c0ea..df11dbc59b84 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -419,6 +419,10 @@ mapAliases { 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 + emacs29 = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 + emacs29-gtk3 = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 + emacs29-nox = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 + emacs29-pgtk = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03 emacsMacport = emacs-macport; # Added 2023-08-10 emacsNativeComp = emacs; # Added 2022-06-08 emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29a49b95a9cc..8dae13cd2031 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13167,11 +13167,6 @@ with pkgs; }; inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { })) - emacs29 - emacs29-gtk3 - emacs29-nox - emacs29-pgtk - emacs30 emacs30-gtk3 emacs30-nox