From c0d33601291021def122a8b45e77c3c7e5eb9320 Mon Sep 17 00:00:00 2001 From: pancho horrillo Date: Mon, 24 Aug 2026 13:15:10 +0200 Subject: [PATCH 1/2] emacs31: 31.1-rc1 -> 31.1 Emacs 31.1 has been released! \o/ https://lists.gnu.org/archive/html/emacs-devel/2026-08/msg00760.html --- pkgs/applications/editors/emacs/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 53433ce31e37..16dc4d4cf24f 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -107,10 +107,10 @@ in { emacs31 = import ./make-emacs.nix (mkArgs { pname = "emacs"; - version = "31.1-rc1"; + version = "31.1"; variant = "mainline"; - rev = "emacs-31.1-rc1"; - hash = "sha256-ZNCYFfMA2f14p57g/LdG6YK7nwUio8fdXmllkChMOSc="; + rev = "emacs-31.1"; + hash = "sha256-lFT5Vt49G17t/fRm5yppO5p9ui10I9JNJVaGO1GPZFI="; }); emacs30 = import ./make-emacs.nix (mkArgs { From 47a4ab7a966902f2fde313cb7e77ce1b967a6173 Mon Sep 17 00:00:00 2001 From: pancho horrillo Date: Mon, 24 Aug 2026 13:26:32 +0200 Subject: [PATCH 2/2] doc/rl-2611: add Emacs 31.1 --- doc/release-notes/rl-2611.section.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index 962a303c1a83..51c0a4e2ccb7 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -16,6 +16,11 @@ +nixpkgs.url = "https://channels.nixos.org/nixos-26.05/nixexprs.tar.zst"; ``` +- Emacs has been updated to 31.1. + This introduces some backwards‐incompatible changes; see the NEWS for details. + NEWS can be viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar. + It can also be browsed [online](https://cgit.git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-31). + - `sing-box` now supports NaïveProxy outbounds. ## Backward Incompatibilities {#sec-nixpkgs-release-26.11-incompatibilities}