guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 306d52e2f617b685e3305bc0b7d2793fb9af6658
Author: Nicolas Goaziou <[email protected]>
AuthorDate: Sat Jan 31 14:48:22 2026 +0100
gnu: emacs-shx: Update to 1.5.2.
* gnu/packages/emacs-xyz.scm (emacs-shx): Update to 1.5.2.
* gnu/packages/patches/emacs-shx-byte-compilation-test.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister deleted file.
Change-Id: I17f8224f0a9e5541d79923fee2136151f86679b1
---
gnu/local.mk | 1 -
gnu/packages/emacs-xyz.scm | 61 ++++++++++------------
.../patches/emacs-shx-byte-compilation-test.patch | 35 -------------
3 files changed, 28 insertions(+), 69 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index ac1e309126..bb0cde0774 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1237,7 +1237,6 @@ dist_patch_DATA =
\
%D%/packages/patches/emacs-pasp-mode-quote-file-names.patch \
%D%/packages/patches/emacs-pgtk-super-key-fix.patch \
%D%/packages/patches/emacs-polymode-fix-lexical-variable-error.patch \
- %D%/packages/patches/emacs-shx-byte-compilation-test.patch \
%D%/packages/patches/emacs-telega-path-placeholder.patch \
%D%/packages/patches/emacs-telega-test-env.patch \
%D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 7c8ac21f03..84df027e3d 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -10994,42 +10994,37 @@ the speedbar window.")
(license license:gpl3+)))
(define-public emacs-shx
- ;; XXX: Some tests fails in the latest stable release.
- (let ((commit "b99d16f36bc278d668d8428c4bc9af77064c336a")
- (revision "1"))
- (package
- (name "emacs-shx")
- (version (git-version "1.5.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/riscy/shx-for-emacs";)
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1wkqnc5n8if8fsh7f3bdr5nzn6dbj1nzdxlmnz8nflmx4g32fp6v"))
- (patches
- (search-patches "emacs-shx-byte-compilation-test.patch"))))
- (build-system emacs-build-system)
- (arguments
- (list
- #:test-command
- #~(list "emacs" "--batch" "--quiet" "--script" "test/script.el")
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'appease-checkdoc
- (lambda _
- (substitute* "shx.el"
- (("Toggle shx-mode on") "Toggle `shx-mode' on")))))))
- (home-page "https://github.com/riscy/shx-for-emacs";)
- (synopsis "Extras for the Comint mode shell")
- (description
- "This package extends Comint mode: it parses markup in the output
+ (package
+ (name "emacs-shx")
+ (version "1.5.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/riscy/shx-for-emacs";)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1f137fj5gcpnwk9a0rp92lvg2rpzdxb0dh4l25hr35lghbj2bcpw"))))
+ (build-system emacs-build-system)
+ (arguments
+ (list
+ #:test-command
+ #~(list "emacs" "--batch" "--quiet" "--script" "test/script.el")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'appease-checkdoc
+ (lambda _
+ (substitute* "shx.el"
+ (("Toggle shx-mode on") "Toggle `shx-mode' on")))))))
+ (home-page "https://github.com/riscy/shx-for-emacs";)
+ (synopsis "Extras for the Comint mode shell")
+ (description
+ "This package extends Comint mode: it parses markup in the output
stream, enabling plots and graphics to be embedded, and adds command-line
functions which plug into Emacs (e.g., use @code{:e <filename>} to edit
a file).")
- (license license:gpl3+))))
+ (license license:gpl3+)))
(define-public emacs-names
(let ((commit "d8baba5360e5253938a25d3e005455b6d2d86971")
diff --git a/gnu/packages/patches/emacs-shx-byte-compilation-test.patch
b/gnu/packages/patches/emacs-shx-byte-compilation-test.patch
deleted file mode 100644
index b0f4714a6c..0000000000
--- a/gnu/packages/patches/emacs-shx-byte-compilation-test.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6e8cb6f2175cd5c108de615a970a27877adfaea0 Mon Sep 17 00:00:00 2001
-From: Maxim Cournoyer <[email protected]>
-Date: Fri, 19 Jan 2024 10:49:51 -0500
-Subject: [PATCH] tests: Fix byte-compilation test.
-
-* test/shx-test.el (shx-test-unit-byte-compile): Simply assert on the
-return value of byte-compile-file, which is non-nil when there are no
-errors.
-
-Fixes: <https://github.com/riscy/shx-for-emacs/issues/33>
----
- test/shx-test.el | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/test/shx-test.el b/test/shx-test.el
-index e18cefb..ed5aee3 100644
---- a/test/shx-test.el
-+++ b/test/shx-test.el
-@@ -83,10 +83,8 @@ Example:
- "Test byte-compilation against the shx.el file."
- (ignore-errors (kill-buffer "*Compile-Log*"))
- (let ((file (replace-regexp-in-string ".elc$" ".el" (symbol-file
'shx-mode))))
-- (byte-compile-file file)
- (shx-test-assert "shx.el passes byte-compilation"
-- (with-current-buffer (get-buffer-create "*Compile-Log*")
-- (<= (- (point-max) (point)) 3)))))
-+ (byte-compile-file file))))
-
- (defun shx-test-unit-declare-function ()
- "Test `declare-function'."
-
-base-commit: b99d16f36bc278d668d8428c4bc9af77064c336a
---
-2.41.0
-
