From: conses <contact@conses.eu>
To: 61941@debbugs.gnu.org
Cc: contact@conses.eu, Nicolas Goaziou <mail@nicolasgoaziou.fr>
Subject: [bug#61941] [PATCH v2] gnu: emacs-helpful: Update to 0.19.1c98f6f.
Date: Thu, 09 Mar 2023 23:55:37 +0100 [thread overview]
Message-ID: <86v8j9a61i.fsf@conses.eu> (raw)
In-Reply-To: <e6cad85daceaf8c46930268efce34f2fa7e96bf9.1677862554.git.contact@conses.eu>
* gnu/packages/emacs-xyz.scm (emacs-helpful): Update to 0.19.1c98f6f.
[source]: Remove fix-docstring-test.patch.
[propagated-inputs]: Remove emacs-shut-up.
---
gnu/packages/emacs-xyz.scm | 52 +++++++++----------
.../emacs-helpful-fix-docstring-test.patch | 18 -------
2 files changed, 26 insertions(+), 44 deletions(-)
delete mode 100644 gnu/packages/patches/emacs-helpful-fix-docstring-test.patch
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3c067fe16c..fa528432cb 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -23303,31 +23303,31 @@ (define-public emacs-download-region
(license license:gpl3+))))
(define-public emacs-helpful
- (package
- (name "emacs-helpful")
- (version "0.19")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/Wilfred/helpful")
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (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))
- (native-inputs
- (list emacs-ert-runner emacs-undercover))
- (arguments
- `(#:tests? #t
- #:test-command '("ert-runner")))
- (home-page "https://github.com/Wilfred/helpful")
- (synopsis "More contextual information in Emacs help")
- (description "@code{helpful} is an alternative to the built-in Emacs help
+ (let ((commit "1c98f6f06a85def5d34c735f8cd407f20cebddf9")
+ (revision "0"))
+ (package
+ (name "emacs-helpful")
+ (version (git-version "0.19" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Wilfred/helpful")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "18b5hjfji51zxjrxhkklxx3j9svk295awmxv8n95mp8ilas2kd3l"))))
+ (build-system emacs-build-system)
+ (propagated-inputs
+ (list emacs-dash emacs-elisp-refs emacs-f emacs-s))
+ (native-inputs
+ (list emacs-ert-runner emacs-undercover))
+ (arguments
+ `(#:tests? #t
+ #:test-command '("ert-runner")))
+ (home-page "https://github.com/Wilfred/helpful")
+ (synopsis "More contextual information in Emacs help")
+ (description "@code{helpful} is an alternative to the built-in Emacs help
that provides much more contextual information.
@itemize
@@ -23346,7 +23346,7 @@ (define-public emacs-helpful
@item Trace, disassemble functions from inside Helpful. This is discoverable
and doesn't require memorisation of commands.
@end itemize\n")
- (license license:gpl3+)))
+ (license license:gpl3+))))
(define-public emacs-logview
(package
diff --git a/gnu/packages/patches/emacs-helpful-fix-docstring-test.patch b/gnu/packages/patches/emacs-helpful-fix-docstring-test.patch
deleted file mode 100644
index de40010fa2..0000000000
--- a/gnu/packages/patches/emacs-helpful-fix-docstring-test.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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)
--
2.39.1
--
Best regards,
conses
next prev parent reply other threads:[~2023-03-09 22:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-03 16:58 [bug#61941] [PATCH 1/2] gnu: emacs-helpful: Update to 0.20.1c98f6f conses
2023-03-03 16:59 ` [bug#61941] [PATCH 2/2] gnu: Remove unused emacs-helpful-fix-docstring-test.patch conses
2023-03-08 14:57 ` [bug#61941] [PATCH 1/2] gnu: emacs-helpful: Update to 0.20.1c98f6f Nicolas Goaziou
2023-03-09 22:47 ` conses
2023-03-09 22:55 ` conses [this message]
2023-03-17 8:25 ` bug#61941: [PATCH v2] gnu: emacs-helpful: Update to 0.19.1c98f6f Nicolas Goaziou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86v8j9a61i.fsf@conses.eu \
--to=contact@conses.eu \
--cc=61941@debbugs.gnu.org \
--cc=mail@nicolasgoaziou.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.