guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 6ad8e56becccb13548a1d024c9d0ef9aea371155
Author: Cayetano Santos <[email protected]>
AuthorDate: Sat Aug 16 09:23:08 2025 +0200
gnu: emacs-minimal: Update to 30.2.
* gnu/packages/emacs.scm (emacs-minimal)[version]: Update.
* gnu/packages/patches/emacs-30-fix-compilation-errors.patch: Remove
file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
Change-Id: I28ab7895dfd83f3016b10de93002799a91ba89e9
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/local.mk | 1 -
gnu/packages/emacs.scm | 9 +++---
.../patches/emacs-30-fix-compilation-errors.patch | 34 ----------------------
3 files changed, 4 insertions(+), 40 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 366fe99fe6..a25d0c015e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1217,7 +1217,6 @@ dist_patch_DATA =
\
%D%/packages/patches/elm-ghc9.2.patch \
%D%/packages/patches/elm-offline-package-registry.patch \
%D%/packages/patches/elm-reactor-static-files.patch \
- %D%/packages/patches/emacs-30-fix-compilation-errors.patch \
%D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \
%D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \
%D%/packages/patches/emacs-elpy-dup-test-name.patch \
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index b24ff226fc..ed2258c199 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -139,7 +139,7 @@
(define-public emacs-minimal
(package
(name "emacs-minimal")
- (version "30.1")
+ (version "30.2")
;; Note: When using (replacement …), ensure that comp-native-version-dir
;; stays the same across grafts.
;; Run `make check-system TESTS=emacs-native-comp' to ensure that grafts
@@ -150,15 +150,14 @@
version ".tar.xz"))
(sha256
(base32
- "13qkdx515qv7m8b2mpd37p16frs0xgl7bw8xvv397bz6fspc3jkc"))
+ "1nggbgnns7lvxn68gzlcsgwh3bigvrbn45kh6dqia9yxlqc6zwxk"))
(patches (search-patches "emacs-disable-jit-compilation.patch"
"emacs-exec-path.patch"
"emacs-fix-scheme-indent-function.patch"
"emacs-native-comp-driver-options.patch"
"emacs-native-comp-fix-filenames.patch"
"emacs-native-comp-pin-packages.patch"
- "emacs-pgtk-super-key-fix.patch"
-
"emacs-30-fix-compilation-errors.patch"))
+ "emacs-pgtk-super-key-fix.patch"))
(modules '((guix build utils)))
(snippet
'(with-directory-excursion "lisp"
@@ -205,7 +204,7 @@
"--disable-build-details")
#:make-flags
#~(list (string-append "SELECTOR=" #$%selector)
- (let ((release-date "2025-02-23 17:41:38"))
+ (let ((release-date "2025-08-14 05:04:03"))
(string-append "RUN_TEMACS= "
#$(this-package-native-input "libfaketime")
"/bin/faketime -m -f '" release-date "'"
diff --git a/gnu/packages/patches/emacs-30-fix-compilation-errors.patch
b/gnu/packages/patches/emacs-30-fix-compilation-errors.patch
deleted file mode 100644
index 2a9a2813f5..0000000000
--- a/gnu/packages/patches/emacs-30-fix-compilation-errors.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 53a5dada413662389a17c551a00d215e51f5049f Mon Sep 17 00:00:00 2001
-From: Pip Cet <[email protected]>
-Date: Mon, 17 Feb 2025 15:21:16 +0000
-Subject: Fix compilation errors due to insufficient compiler safety
- (bug#63288)
-
-The default safety level is 1. Restoring the default safety level to
-1 after it was temporarily 0 should reset byte-compile-delete-errors
-to nil, its default level. Failing to do that resulted in
-miscompilation of code in highly-parallel builds.
-
-* lisp/emacs-lisp/cl-macs.el (cl--do-proclaim): Change
-'byte-compile-delete-errors' to become t only at 'safety' level 0, not
-levels 1 or 2.
----
- lisp/emacs-lisp/cl-macs.el | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
-index eef69e6899e..e73edbadaf2 100644
---- a/lisp/emacs-lisp/cl-macs.el
-+++ b/lisp/emacs-lisp/cl-macs.el
-@@ -2701,7 +2701,7 @@ Example:
- (let ((speed (assq (nth 1 (assq 'speed (cdr spec)))
- '((0 nil) (1 t) (2 t) (3 t))))
- (safety (assq (nth 1 (assq 'safety (cdr spec)))
-- '((0 t) (1 t) (2 t) (3 nil)))))
-+ '((0 t) (1 nil) (2 nil) (3 nil)))))
- (if speed (setq cl--optimize-speed (car speed)
- byte-optimize (nth 1 speed)))
- (if safety (setq cl--optimize-safety (car safety)
---
-cgit v1.2.3
-
