emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#61941: closed ([PATCH 1/2] gnu: emacs-helpful: Update to 0.20.1c98f6


From: GNU bug Tracking System
Subject: bug#61941: closed ([PATCH 1/2] gnu: emacs-helpful: Update to 0.20.1c98f6f.)
Date: Fri, 17 Mar 2023 08:26:02 +0000

Your message dated Fri, 17 Mar 2023 09:25:29 +0100
with message-id <87lejvdbt2.fsf@nicolasgoaziou.fr>
and subject line Re: [bug#61941] [PATCH v2] gnu: emacs-helpful: Update to 
0.19.1c98f6f.
has caused the debbugs.gnu.org bug report #61941,
regarding [PATCH 1/2] gnu: emacs-helpful: Update to 0.20.1c98f6f.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
61941: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=61941
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
--- Begin Message --- Subject: [PATCH 1/2] gnu: emacs-helpful: Update to 0.20.1c98f6f. Date: Fri, 03 Mar 2023 17:58:26 +0100 User-agent: Gnus/5.13 (Gnus v5.13)
* gnu/packages/emacs-xyz.scm (emacs-helpful): Update to 0.20.1c98f6f.
[source]: Remove fix-docstring-test.patch.
[propagated-inputs]: Remove emacs-shut-up.
---
 gnu/packages/emacs-xyz.scm | 52 +++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 3f7fcf4481..a3535728f8 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -23126,31 +23126,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.20" 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-elisp-refs emacs-dash emacs-s emacs-f))
+      (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
@@ -23169,7 +23169,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
-- 
2.39.1



-- 
Best regards,
conses



--- End Message ---
--- Begin Message --- Subject: Re: [bug#61941] [PATCH v2] gnu: emacs-helpful: Update to 0.19.1c98f6f. Date: Fri, 17 Mar 2023 09:25:29 +0100 User-agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
Hello,

conses <contact@conses.eu> writes:

> * gnu/packages/emacs-xyz.scm (emacs-helpful): Update to 0.19.1c98f6f.
> [source]: Remove fix-docstring-test.patch.
> [propagated-inputs]: Remove emacs-shut-up.

You also need to dereference the patch file in gnu/local.mk.

I did that, updated the commit message and applied your patch.

Thank you.

Regards,
-- 
Nicolas Goaziou


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]