diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index ef8a5d923822..b8156c5b3bcc 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -535,10 +535,10 @@ mkDerivation (finalAttrs: { }; }; - meta = meta // { + meta = { broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); knownVulnerabilities = lib.optionals (lib.versionOlder version "30") [ "CVE-2024-53920 CVE-2025-1244, please use newer versions such as emacs30" ]; - }; + } // meta; }) diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 952d8e5aeab7..7b2ba87227bf 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -13,6 +13,7 @@ let patches ? _: [ ], rev, hash, + meta ? { }, }: { inherit @@ -98,7 +99,7 @@ let } .${variant}; mainProgram = "emacs"; - }; + } // meta; }; in { @@ -152,9 +153,24 @@ in emacs29-macport = import ./make-emacs.nix (mkArgs { pname = "emacs-mac"; - version = "29.1"; + version = "29.4"; variant = "macport"; - rev = "emacs-29.1-mac-10.0"; - hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU="; + rev = "emacs-29.4-mac-10.1"; + hash = "sha256-8OQ+fon9tclbh/eUJ09uqKfMaz9M77QnLIp2R8QB6Ic="; + patches = fetchpatch: [ + # CVE-2024-53920 + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/07_all_trusted-content.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f"; + hash = "sha256-zUWM2HDO5MHEB5fC5TCUxzmSafMvXO5usRzCyp9Q7P4="; + }) + + # CVE-2025-1244 + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/06_all_man.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f"; + hash = "sha256-Vdf6GF5YmGoHTkxiD9mdYH0hgvfovZwrqYN1NQ++U1w="; + }) + ]; + + meta.knownVulnerabilities = [ ]; }); }