[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: gnu: emacs-helpful: Update to 0.19
From: |
guix-commits |
Subject: |
branch master updated: gnu: emacs-helpful: Update to 0.19 |
Date: |
Tue, 31 May 2022 00:22:58 -0400 |
This is an automated email from the git hooks/post-receive script.
lilyp pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 6169c582d1 gnu: emacs-helpful: Update to 0.19
6169c582d1 is described below
commit 6169c582d154f65a9834a4e07226de4fc98ea67f
Author: yarl baudig <yarl-baudig@mailoo.org>
AuthorDate: Mon May 30 09:20:24 2022 +0200
gnu: emacs-helpful: Update to 0.19
* gnu/packages/patches/emacs-helpful-docstring-test.patch: New file.
* gnu/packages/emacs-xyz.scm (emacs-helpful): Update to 0.19.
[source]: Use the patch.
* gnu/local.mk (dist_patch_DATA): Register the patch.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
gnu/local.mk | 1 +
gnu/packages/emacs-xyz.scm | 6 ++++--
.../patches/emacs-helpful-fix-docstring-test.patch | 18 ++++++++++++++++++
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index f6aae15e76..bb2913c3a2 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1028,6 +1028,7 @@ dist_patch_DATA =
\
%D%/packages/patches/emacs-git-email-missing-parens.patch \
%D%/packages/patches/emacs-fix-scheme-indent-function.patch \
%D%/packages/patches/emacs-json-reformat-fix-tests.patch \
+ %D%/packages/patches/emacs-helpful-fix-docstring-test.patch \
%D%/packages/patches/emacs-highlight-stages-add-gexp.patch \
%D%/packages/patches/emacs-hyperbole-toggle-messaging.patch \
%D%/packages/patches/emacs-libgit-use-system-libgit2.patch \
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 8fe450cf7b..22d723c879 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -20130,7 +20130,7 @@ downloading manager for Emacs.")
(define-public emacs-helpful
(package
(name "emacs-helpful")
- (version "0.18")
+ (version "0.19")
(source
(origin
(method git-fetch)
@@ -20139,7 +20139,9 @@ downloading manager for Emacs.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0gdjxykqkal2x765mi51m99i5ql23i1fy909wy4mzj5ajhjfgqcc"))))
+ (base32 "0qwsifzsjw95l83m7z07fr9h1sqbhggwmcps1qgbddpan2a8ab8a"))
+ ;; Cherry-picked from upstream, remove when bumping to 0.20.
+ (patches (search-patches "emacs-helpful-fix-docstring-test.patch"))))
(build-system emacs-build-system)
(propagated-inputs
(list emacs-elisp-refs emacs-dash emacs-s emacs-f emacs-shut-up))
diff --git a/gnu/packages/patches/emacs-helpful-fix-docstring-test.patch
b/gnu/packages/patches/emacs-helpful-fix-docstring-test.patch
new file mode 100644
index 0000000000..de40010fa2
--- /dev/null
+++ b/gnu/packages/patches/emacs-helpful-fix-docstring-test.patch
@@ -0,0 +1,18 @@
+This patch fixing a build failure has been cherry-picked from upstream.
+Originally submitted as pull request by Erik Šabič.
+See also <https://github.com/Wilfred/helpful/pull/296>.
+diff --git a/test/helpful-unit-test.el b/test/helpful-unit-test.el
+index a07aa8e..8a95129 100644
+--- a/test/helpful-unit-test.el
++++ b/test/helpful-unit-test.el
+@@ -119,7 +119,9 @@ bar")))
+ (should
+ (equal
+ (helpful--docstring #'test-foo-advised t)
+- "Docstring here too.")))
++ (if (version< emacs-version "28")
++ "Docstring here too."
++ "Docstring here too.\n\nThis function has :around advice:
`ad-Advice-test-foo-advised'."))))
+
+ (defun test-foo-no-docstring ()
+ nil)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: gnu: emacs-helpful: Update to 0.19,
guix-commits <=