Unverified Commit 7660ca03 authored by Lin Jian's avatar Lin Jian
Browse files

emacs28{,-gtk3,-nox}: remove 

They are affected by CVEs which are fixed in Emacs 30.
parent 20758943

pkgs/applications/editors/emacs/default.nix

+0 −12
Original line number Diff line number Diff line
@@ -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 {

pkgs/applications/editors/emacs/sources.nix

+0 −35
Original line number Diff line number Diff line
@@ -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";

pkgs/top-level/aliases.nix

+4 −1
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+0 −4
Original line number Diff line number Diff line
@@ -13167,10 +13167,6 @@ with pkgs; 
  };















  inherit (recurseIntoAttrs (callPackage ../applications/editors/emacs { }))













    emacs28













    emacs28-gtk3













    emacs28-nox



























    emacs29















    emacs29-gtk3















    emacs29-nox