From 256102ec3d621b2e08627038fea6c23d6ccf3622 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Fri, 15 Aug 2025 03:16:27 +0800 Subject: [PATCH] emacs: 30.1 -> 30.2 https://lists.gnu.org/archive/html/emacs-devel/2025-08/msg00493.html Two patches are removed. The first one is backported[1] to 30.2. The second one is contained in 30.2. [1]: 6cac92928a99a2cf33aeeeddf295cf981750391c --- pkgs/applications/editors/emacs/sources.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 77c66d758491..c706d8ecc276 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -105,25 +105,15 @@ in { emacs30 = import ./make-emacs.nix (mkArgs { pname = "emacs"; - version = "30.1"; + version = "30.2"; variant = "mainline"; - rev = "30.1"; - hash = "sha256-wBuWLuFzwB77FqAYAUuNe3CuJFutjqp0XGt5srt7jAo="; + rev = "30.2"; + hash = "sha256-3Lfb3HqdlXqSnwJfxe7npa4GGR9djldy8bKRpkQCdSA="; patches = fetchpatch: [ (builtins.path { name = "inhibit-lexical-cookie-warning-67916.patch"; path = ./inhibit-lexical-cookie-warning-67916-30.patch; }) - (fetchpatch { - # bug#63288 and bug#76523 - url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=53a5dada413662389a17c551a00d215e51f5049f"; - hash = "sha256-AEvsQfpdR18z6VroJkWoC3sBoApIYQQgeF/P2DprPQ8="; - }) - (fetchpatch { - # bug#76573 - url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=05ecb2b8f0216aa3f391ee661aad4d61fd6aed0e"; - hash = "sha256-fvnHMvuqwQseVrDpVpnzSaoWfXrR5tsjIib7+lhRGII="; - }) ]; });