Unverified Commit ceb68101 authored by Lin Jian's avatar Lin Jian Committed by GitHub
Browse files

emacs28-macport: remove (#396629)

parents b415ac3e 2472eda1

doc/release-notes/rl-2505.section.md

+1 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ 
- `docker_24` has been removed, as it was EOL with vulnerabilities since June 08, 2024.



- Emacs 28 and 29 have been removed.

- Emacs 28 Macport has been removed, while CVEs of Emacs 29 Macport are patched.



- `containerd` has been updated to v2, which contains breaking changes. See the [containerd

  2.0](https://github.com/containerd/containerd/blob/main/docs/containerd-2.0.md) documentation for more

pkgs/applications/editors/emacs/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ lib.makeScope pkgs.newScope ( 
      withPgtk = true;

    };



    emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs;



    emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs;

  }

)

pkgs/applications/editors/emacs/sources.nix

+0 −29
Original line number Diff line number Diff line
@@ -122,35 +122,6 @@ in 
    ];

  });



  emacs28-macport = import ./make-emacs.nix (mkArgs {

    pname = "emacs-mac";

    version = "28.2";

    variant = "macport";

    rev = "emacs-28.2-mac-9.1";

    hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE=";

    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=";

      })

    ];

  });



  emacs29-macport = import ./make-emacs.nix (mkArgs {

    pname = "emacs-mac";

    version = "29.4";

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -546,6 +546,7 @@ mapAliases { 
  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-macport = throw "Emacs 28 Macport is removed due to CVEs which are fixed in Emacs 30 and backported to Emacs 29 Macport"; # Added 2025-04-06

  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

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -14185,7 +14185,6 @@ with pkgs; 
    emacs30-nox

    emacs30-pgtk













    emacs28-macport















    emacs29-macport















    ;