Skip to content

Commit 36bdbdf

Browse files
committed
emacs29{,-gtk3,-nox,-pgtk}: remove
They are affected by CVEs which are fixed in Emacs 30.
1 parent 7660ca0 commit 36bdbdf

File tree

4 files changed

+4
-27
lines changed

4 files changed

+4
-27
lines changed

pkgs/applications/editors/emacs/default.nix

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,6 @@ lib.makeScope pkgs.newScope (
3232
;
3333
};
3434

35-
emacs29 = callPackage (self.sources.emacs29) inheritedArgs;
36-
37-
emacs29-gtk3 = self.emacs29.override {
38-
withGTK3 = true;
39-
};
40-
41-
emacs29-nox = self.emacs29.override {
42-
noGui = true;
43-
};
44-
45-
emacs29-pgtk = self.emacs29.override {
46-
withPgtk = true;
47-
};
48-
4935
emacs30 = callPackage (self.sources.emacs30) inheritedArgs;
5036

5137
emacs30-gtk3 = self.emacs30.override {

pkgs/applications/editors/emacs/sources.nix

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,6 @@ let
101101
};
102102
in
103103
{
104-
emacs29 = import ./make-emacs.nix (mkArgs {
105-
pname = "emacs";
106-
version = "29.4";
107-
variant = "mainline";
108-
rev = "29.4";
109-
hash = "sha256-FCP6ySkN9mAdp2T09n6foS2OciqZXc/54guRZ0B4Z2s=";
110-
});
111-
112104
emacs30 = import ./make-emacs.nix (mkArgs {
113105
pname = "emacs";
114106
version = "30.1";

pkgs/top-level/aliases.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,10 @@ mapAliases {
419419
emacs28NativeComp = emacs28; # Added 2022-06-08
420420
emacs28Packages = throw "'emacs28Packages' has been renamed to/replaced by 'emacs28.pkgs'"; # Converted to throw 2024-10-17
421421
emacs28WithPackages = throw "'emacs28WithPackages' has been renamed to/replaced by 'emacs28.pkgs.withPackages'"; # Converted to throw 2024-10-17
422+
emacs29 = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
423+
emacs29-gtk3 = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
424+
emacs29-nox = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
425+
emacs29-pgtk = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
422426
emacsMacport = emacs-macport; # Added 2023-08-10
423427
emacsNativeComp = emacs; # Added 2022-06-08
424428
emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17

pkgs/top-level/all-packages.nix

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13167,11 +13167,6 @@ with pkgs;
1316713167
};
1316813168

1316913169
inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { }))
13170-
emacs29
13171-
emacs29-gtk3
13172-
emacs29-nox
13173-
emacs29-pgtk
13174-
1317513170
emacs30
1317613171
emacs30-gtk3
1317713172
emacs30-nox

0 commit comments

Comments
 (0)