[PATCH] gnu: emacs-ws-butler: Update to 1.1 from new maintainer.

  • Done
  • quality assurance status badge
Details
2 participants
  • Ian Eure
  • Liam Hupfer
Owner
unassigned
Submitted by
Liam Hupfer
Severity
normal

Debbugs page

Liam Hupfer wrote 2 weeks ago
(address . guix-patches@gnu.org)(name . Liam Hupfer)(address . liam@hpfr.net)
8807437ea73b0a394e85849aa8927b006d026e0f.1740340448.git.liam@hpfr.net
The original author of ws-butler is largely inactive. Sean Whitton has
taken over maintenance at NonGNU ELPA and applied several outstanding
patches. ELPA tarballs do not deploy tests, so remove test support and
rely on upstream in alignment with other packages sourced from NonGNU
ELPA.

While we’re here, tidy the package docs and run guix style.

* gnu/packages/emacs-xyz.scm (emacs-ws-butler): Update to 1.1 from new
maintainer.

Change-Id: I09db3d855c4b15d2253090884106e00bc1719607
---
gnu/packages/emacs-xyz.scm | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)

Toggle diff (46 lines)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 59c1927135..06b50cd40c 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -22499,27 +22499,21 @@ (define-public emacs-hercules
(define-public emacs-ws-butler
(package
(name "emacs-ws-butler")
- (version "0.7")
+ (version "1.1")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/lewang/ws-butler")
- (commit "v0.7")))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri (string-append "https://elpa.nongnu.org/nongnu/ws-butler-" version
+ ".tar"))
(sha256
- (base32 "17f73isx2wdwzjcxparyy7ngl4cha0g69da1d72b3yidzim1kh6h"))))
+ (base32 "1vy7g2ryg1drcz9zpn011d36zcd9a5b5yny5hwpjrllqj5dg73jx"))))
(build-system emacs-build-system)
- (arguments
- `(#:tests? #t
- #:test-command '("ert-runner" "tests")))
- (native-inputs
- (list emacs-ert-runner))
- (home-page "https://github.com/lewang/ws-butler")
- (synopsis "Trim spaces from end of lines")
+ (home-page "https://elpa.nongnu.org/nongnu/ws-butler.html")
+ (synopsis "Unobtrusively remove trailing whitespace")
(description
- "This Emacs package automatically and unobtrusively trims whitespace
-characters from end of lines.")
+ "ws-butler automatically trims trailing whitespace characters on save.
+In contrast with other whitespace cleanup solutions, only modified lines are
+trimmed.")
(license license:gpl3+)))
(define-public emacs-opencl-mode

base-commit: 23b068c036223e70bdea9d7d579850a1cffc02a7
--
2.48.1
Ian Eure wrote 2 weeks ago
(name . Liam Hupfer)(address . liam@hpfr.net)(address . 76512@debbugs.gnu.org)
87a5abgzl8.fsf@retrospec.tv
Hi Liam,

Liam Hupfer <liam@hpfr.net> writes:

Toggle quote (46 lines)
> The original author of ws-butler is largely inactive. Sean
> Whitton has
> taken over maintenance at NonGNU ELPA and applied several
> outstanding
> patches. ELPA tarballs do not deploy tests, so remove test
> support and
> rely on upstream in alignment with other packages sourced from
> NonGNU
> ELPA.
>
> While we’re here, tidy the package docs and run guix style.
>
> * gnu/packages/emacs-xyz.scm (emacs-ws-butler): Update to 1.1
> from new
> maintainer.
>
> Link: https://github.com/lewang/ws-butler/issues/52
> Link: https://github.com/lewang/ws-butler/issues/58
> Change-Id: I09db3d855c4b15d2253090884106e00bc1719607
> ---
> gnu/packages/emacs-xyz.scm | 26 ++++++++++----------------
> 1 file changed, 10 insertions(+), 16 deletions(-)
>
> diff --git a/gnu/packages/emacs-xyz.scm
> b/gnu/packages/emacs-xyz.scm
> index 59c1927135..06b50cd40c 100644
> --- a/gnu/packages/emacs-xyz.scm
> +++ b/gnu/packages/emacs-xyz.scm
> @@ -22499,27 +22499,21 @@ (define-public emacs-hercules
> (define-public emacs-ws-butler
> (package
> (name "emacs-ws-butler")
> - (version "0.7")
> + (version "1.1")
> (source
> (origin
> - (method git-fetch)
> - (uri (git-reference
> - (url "https://github.com/lewang/ws-butler")
> - (commit "v0.7")))
> - (file-name (git-file-name name version))
> + (method url-fetch)
> + (uri (string-append
> "https://elpa.nongnu.org/nongnu/ws-butler-" version
> + ".tar"))

Is there an upstream source repo? If it’s reasonable to do so,
it’s preferable to use that rather than M/ELPA URLs.

Everything else looks good to me.

Thanks,
-- Ian
Liam Hupfer wrote 2 weeks ago
(name . Ian Eure)(address . ian@retrospec.tv)(address . 76512@debbugs.gnu.org)
87eczmk5j6.fsf@hpfr.net
Ian Eure <ian@retrospec.tv> writes:

Toggle quote (3 lines)
> Is there an upstream source repo? If it’s reasonable to do so,
> it’s preferable to use that rather than M/ELPA URLs.

Sean seems to be maintaining it directly in the NonGNU ELPA repo:

I took a look at other packages from NonGNU ELPA in emacs-xyz and they
all seem to use the generated tarballs, so I followed suit here. I think
using the ELPA tarball means ‘guix refresh’ will work, which seems
noteworthy. I know upstream Git repos are preferable to MELPA, but I
think deploying to ELPA and NonGNU ELPA is more intentional on the
upstream maintainer’s part (focused on tagged releases).

Toggle quote (2 lines)
> Everything else looks good to me.

Good to hear, thanks for reviewing!

—Liam
Ian Eure wrote 2 weeks ago
(name . Liam Hupfer)(address . liam@hpfr.net)(address . 76512@debbugs.gnu.org)
87plj6fwuz.fsf@retrospec.tv
Hi Liam,

Liam Hupfer <liam@hpfr.net> writes:

Toggle quote (21 lines)
> Ian Eure <ian@retrospec.tv> writes:
>
>> Is there an upstream source repo? If it’s reasonable to do so,
>> it’s preferable to use that rather than M/ELPA URLs.
>
> Sean seems to be maintaining it directly in the NonGNU ELPA
> repo:
> <https://git.savannah.gnu.org/cgit/emacs/nongnu.git/?h=elpa/ws-butler>
>
> I took a look at other packages from NonGNU ELPA in emacs-xyz
> and they
> all seem to use the generated tarballs, so I followed suit
> here. I think
> using the ELPA tarball means ‘guix refresh’ will work, which
> seems
> noteworthy. I know upstream Git repos are preferable to MELPA,
> but I
> think deploying to ELPA and NonGNU ELPA is more intentional on
> the
> upstream maintainer’s part (focused on tagged releases).

Okay, that sure sounds like "not reasonable to do so" to me.
Thank you for following up, I’ll push this momentarily.

-- Ian
Ian Eure wrote 2 weeks ago
control message for bug #76512
(address . control@debbugs.gnu.org)
87o6yqfurh.fsf_-_@retrospec.tv
close 76512
quit
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 76512@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 76512
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help