[bug#61941] [PATCH 1/2] gnu: emacs-helpful: Update to 0.20.1c98f6f.

[bug#61941] [PATCH 1/2] gnu: emacs-helpful: Update to 0.20.1c98f6f.

[conses]

* 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

[bug#61941] [PATCH 2/2] gnu: Remove unused emacs-helpful-fix-docstring-test.patch.

[conses]

---
 .../emacs-helpful-fix-docstring-test.patch     | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 gnu/packages/patches/emacs-helpful-fix-docstring-test.patch

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

[bug#61941] [PATCH 1/2] gnu: emacs-helpful: Update to 0.20.1c98f6f.

[Nicolas Goaziou]

Hello,

conses <contact@conses.eu> writes:

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

Thank you. Some comments follow.

> +  (let ((commit "1c98f6f06a85def5d34c735f8cd407f20cebddf9")
> +        (revision "0"))

Is there a particular reason to use an unreleased version?

> +    (package
> +      (name "emacs-helpful")
> +      (version (git-version "0.20" revision commit))

Base version is actually still 0.19. Upstream bumped Version keyword,
but the README mentions there is no official 0.20 yet. I suggest to
stick to 0.19.

> +      (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))

While you're at it, could you re-order inputs alphabetically?

You can also merge both patches.

Regards,
-- 
Nicolas Goaziou

[bug#61941] [PATCH 1/2] gnu: emacs-helpful: Update to 0.20.1c98f6f.

[conses]

Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:

>> +  (let ((commit "1c98f6f06a85def5d34c735f8cd407f20cebddf9")
>> +        (revision "0"))
>
> Is there a particular reason to use an unreleased version?
>

The latest release was over two years ago and a lot of functionality has
been added.

>> +    (package
>> +      (name "emacs-helpful")
>> +      (version (git-version "0.20" revision commit))
>
> Base version is actually still 0.19. Upstream bumped Version keyword,
> but the README mentions there is no official 0.20 yet. I suggest to
> stick to 0.19.
>

Ok, will send a revised patch.

>> +      (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))
>
> While you're at it, could you re-order inputs alphabetically?
>
> You can also merge both patches.
>

Sure.  Thanks for having a look!

> Regards,

-- 
Best regards,
conses

[bug#61941] [PATCH v2] gnu: emacs-helpful: Update to 0.19.1c98f6f.

[conses]

* 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

bug#61941: [PATCH v2] gnu: emacs-helpful: Update to 0.19.1c98f6f.

[Nicolas Goaziou]

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