From e1b49e169133625954b69f0c046406ba9965c358 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 21 Apr 2026 23:26:10 +0800 Subject: [PATCH 1/2] emacs: remove meta.knownVulnerabilities of Emacs <30 Emacs 29 has been removed from Nixpkgs. This is a small cleanup. --- pkgs/applications/editors/emacs/make-emacs.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 0c44afee06e7..4f6162b51d59 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -507,9 +507,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { broken = (withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) || withWebkitgtk; - knownVulnerabilities = lib.optionals (lib.versionOlder version "30") [ - "CVE-2024-53920 CVE-2025-1244, please use newer versions such as emacs30" - ]; } // meta; }) From 1beeb6bcafc980c723469ddd8f382fc783ffea82 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 21 Apr 2026 23:31:50 +0800 Subject: [PATCH 2/2] emacs: lift withXwidgets constraint Recently, upstream Emacs re-enabled[1] withXidgets. Following that change, we update the default value for withXwidgets to false only for Emacs 30 so that other versions of Emacs will enable withXwidgets by default. In addition, we stop setting meta.broken with withXwidgets, which makes it easier for users to enable withXwidgets for Emacs 30 by cherry-picking the upstream patch[1]. [1]: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=80728 --- pkgs/applications/editors/emacs/make-emacs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 4f6162b51d59..48474bc4b7cd 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -97,9 +97,10 @@ withXwidgets ? !noGui && (withGTK3 || withPgtk || withNS || variant == "macport") - && (stdenv.hostPlatform.isDarwin || lib.versionOlder version "30"), + && (stdenv.hostPlatform.isDarwin || lib.versions.major version != "30"), # XXX: - upstream bug 66068 precludes newer versions of webkit2gtk (https://lists.gnu.org/archive/html/bug-gnu-emacs/2024-09/msg00695.html) # XXX: - Apple_SDK WebKit is compatible with Emacs. + # XXX: - upstream bug 80728 lifts the webkit2gtk version check added in upstream bug 66068 withSmallJaDic ? false, withCompressInstall ? true, @@ -505,8 +506,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - broken = - (withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) || withWebkitgtk; + broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); } // meta; })