GNU bug report logs -
#77836
[PATCH emacs-team] gnu: emacs-ws-butler: Update to 1.3.
Previous Next
To reply to this bug, email your comments to 77836 AT debbugs.gnu.org.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
andrew <at> trop.in, csantosb <at> inventati.org, divya <at> subvertising.org, hako <at> ultrarare.space, ian <at> retrospec.tv, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org
:
bug#77836
; Package
guix-patches
.
(Wed, 16 Apr 2025 06:51:01 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Cayetano Santos <csantosb <at> inventati.org>
:
New bug report received and forwarded. Copy sent to
andrew <at> trop.in, csantosb <at> inventati.org, divya <at> subvertising.org, hako <at> ultrarare.space, ian <at> retrospec.tv, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org
.
(Wed, 16 Apr 2025 06:51:01 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/emacs-xyz.scm (emacs-ws-butler): Update to 1.3.
Change-Id: Ibee124269d8fe54029f9dea902991ba7d86cab89
---
gnu/packages/emacs-xyz.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 82831f0595..4504ecae6e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -23123,15 +23123,19 @@ (define-public emacs-hercules
(define-public emacs-ws-butler
(package
(name "emacs-ws-butler")
- (version "1.1")
+ (version "1.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.nongnu.org/nongnu/ws-butler-" version
".tar"))
(sha256
- (base32 "1vy7g2ryg1drcz9zpn011d36zcd9a5b5yny5hwpjrllqj5dg73jx"))))
+ (base32 "14q19rvps5jcshyls3aa55pxmqbbkhhbdlchnl7ybxwkvvmig9zh"))))
(build-system emacs-build-system)
+ (arguments
+ (list
+ #:tests? #f ; no Makefile in tar file
+ #:test-command #~(list "make" "test")))
(home-page "https://elpa.nongnu.org/nongnu/ws-butler.html")
(synopsis "Unobtrusively remove trailing whitespace")
(description
base-commit: 373545dc9efbae6589f502773aa49e26e42c585e
--
2.49.0
Information forwarded
to
guix-patches <at> gnu.org
:
bug#77836
; Package
guix-patches
.
(Wed, 16 Apr 2025 19:50:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 77836 <at> debbugs.gnu.org (full text, mbox):
Am Mittwoch, dem 16.04.2025 um 08:50 +0200 schrieb Cayetano Santos:
> * gnu/packages/emacs-xyz.scm (emacs-ws-butler): Update to 1.3.
>
> Change-Id: Ibee124269d8fe54029f9dea902991ba7d86cab89
> ---
> gnu/packages/emacs-xyz.scm | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
> index 82831f0595..4504ecae6e 100644
> --- a/gnu/packages/emacs-xyz.scm
> +++ b/gnu/packages/emacs-xyz.scm
> @@ -23123,15 +23123,19 @@ (define-public emacs-hercules
> (define-public emacs-ws-butler
> (package
> (name "emacs-ws-butler")
> - (version "1.1")
> + (version "1.3")
> (source
> (origin
> (method url-fetch)
> (uri (string-append
> "https://elpa.nongnu.org/nongnu/ws-butler-" version
> ".tar"))
> (sha256
> - (base32
> "1vy7g2ryg1drcz9zpn011d36zcd9a5b5yny5hwpjrllqj5dg73jx"))))
> + (base32
> "14q19rvps5jcshyls3aa55pxmqbbkhhbdlchnl7ybxwkvvmig9zh"))))
> (build-system emacs-build-system)
> + (arguments
> + (list
> + #:tests? #f ; no Makefile in tar file
> + #:test-command #~(list "make" "test")))
Why do you use "make" for a test command, when there's no Makefile?
> (home-page "https://elpa.nongnu.org/nongnu/ws-butler.html")
> (synopsis "Unobtrusively remove trailing whitespace")
> (description
>
> base-commit: 373545dc9efbae6589f502773aa49e26e42c585e
Cheers
Information forwarded
to
guix-patches <at> gnu.org
:
bug#77836
; Package
guix-patches
.
(Thu, 17 Apr 2025 08:51:02 GMT)
Full text and
rfc822 format available.
Message #11 received at 77836 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
>mer. 16 avril 2025 at 21:49, Liliana Marie Prikler <liliana.prikler <at> gmail.com> wrote:
>> (source
>> (origin
>> (method url-fetch)
>> (uri (string-append
>> "https://elpa.nongnu.org/nongnu/ws-butler-" version
>> ".tar"))
>> (sha256
>> - (base32
>> "1vy7g2ryg1drcz9zpn011d36zcd9a5b5yny5hwpjrllqj5dg73jx"))))
>> + (base32
>> "14q19rvps5jcshyls3aa55pxmqbbkhhbdlchnl7ybxwkvvmig9zh"))))
>> (build-system emacs-build-system)
>> + (arguments
>> + (list
>> + #:tests? #f ; no Makefile in tar file
>> + #:test-command #~(list "make" "test")))
> Why do you use "make" for a test command, when there's no Makefile?
There is a Makefile in the repo, including a target for tests:
https://git.savannah.gnu.org/cgit/emacs/nongnu.git/tree/?h=elpa/ws-butler
Except that the Makefile is removed from elpa .tar file.
Similar to other packages, we disable tests, specifying the reason,
while we provide the recipe to run them, once the issue fixed.
Not sure what is the right option with elpa .tar files, cloning nongnu
instead ? remove test-command ?
C.
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org
:
bug#77836
; Package
guix-patches
.
(Thu, 17 Apr 2025 18:21:03 GMT)
Full text and
rfc822 format available.
Message #14 received at 77836 <at> debbugs.gnu.org (full text, mbox):
Am Donnerstag, dem 17.04.2025 um 10:51 +0200 schrieb Cayetano Santos:
>
> > mer. 16 avril 2025 at 21:49, Liliana Marie Prikler
> > <liliana.prikler <at> gmail.com> wrote:
>
> > > (source
> > > (origin
> > > (method url-fetch)
> > > (uri (string-append
> > > "https://elpa.nongnu.org/nongnu/ws-butler-" version
> > > ".tar"))
> > > (sha256
> > > - (base32
> > > "1vy7g2ryg1drcz9zpn011d36zcd9a5b5yny5hwpjrllqj5dg73jx"))))
> > > + (base32
> > > "14q19rvps5jcshyls3aa55pxmqbbkhhbdlchnl7ybxwkvvmig9zh"))))
> > > (build-system emacs-build-system)
> > > + (arguments
> > > + (list
> > > + #:tests? #f ; no Makefile in tar file
> > > + #:test-command #~(list "make" "test")))
> > Why do you use "make" for a test command, when there's no Makefile?
>
> There is a Makefile in the repo, including a target for tests:
>
>
> https://git.savannah.gnu.org/cgit/emacs/nongnu.git/tree/?h=elpa/ws-butler
>
> Except that the Makefile is removed from elpa .tar file.
>
> Similar to other packages, we disable tests, specifying the reason,
> while we provide the recipe to run them, once the issue fixed.
>
> Not sure what is the right option with elpa .tar files, cloning
> nongnu instead ? remove test-command ?
Looking at the Makefile, I think it's actually preferable to spell out
the Emacs command for testing (including "--batch", which upstream does
not appear to use), in which case we only need the tests themselves
preserved in the archive.
Cheers
Information forwarded
to
guix-patches <at> gnu.org
:
bug#77836
; Package
guix-patches
.
(Thu, 17 Apr 2025 19:42:05 GMT)
Full text and
rfc822 format available.
Message #17 received at 77836 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
>jeu. 17 avril 2025 at 20:19, Liliana Marie Prikler <liliana.prikler <at> gmail.com> wrote:
>> > Why do you use "make" for a test command, when there's no Makefile?
>> There is a Makefile in the repo, including a target for tests:
>> https://git.savannah.gnu.org/cgit/emacs/nongnu.git/tree/?h=elpa/ws-butler
>>
>> Except that the Makefile is removed from elpa .tar file.
>>
>> Similar to other packages, we disable tests, specifying the reason,
>> while we provide the recipe to run them, once the issue fixed.
>>
>> Not sure what is the right option with elpa .tar files, cloning
>> nongnu instead ? remove test-command ?
> Looking at the Makefile, I think it's actually preferable to spell out
> the Emacs command for testing (including "--batch", which upstream does
> not appear to use), in which case we only need the tests themselves
> preserved in the archive.
Correct me if I’m wrong, but the tests folder itself is absent from the
tar file, I’m afraid.
At some point, we’d better replace all those limited elpa .tar files by
the real sources.
[signature.asc (application/pgp-signature, inline)]
Information forwarded
to
guix-patches <at> gnu.org
:
bug#77836
; Package
guix-patches
.
(Thu, 17 Apr 2025 20:04:03 GMT)
Full text and
rfc822 format available.
Message #20 received at 77836 <at> debbugs.gnu.org (full text, mbox):
Am Donnerstag, dem 17.04.2025 um 21:42 +0200 schrieb Cayetano Santos:
> > Looking at the Makefile, I think it's actually preferable to spell
> > out the Emacs command for testing (including "--batch", which
> > upstream does not appear to use), in which case we only need the
> > tests themselves preserved in the archive.
>
> Correct me if I’m wrong, but the tests folder itself is absent from
> the tar file, I’m afraid.
>
> At some point, we’d better replace all those limited elpa .tar files
> by the real sources.
Yeah, we do this for Python packages too and the same logic applies
here. No tests in ELPA/PyPI? => Use upstream git.
Cheers
Information forwarded
to
andrew <at> trop.in, csantosb <at> inventati.org, divya <at> subvertising.org, hako <at> ultrarare.space, ian <at> retrospec.tv, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org
:
bug#77836
; Package
guix-patches
.
(Thu, 17 Apr 2025 21:06:03 GMT)
Full text and
rfc822 format available.
Message #23 received at 77836 <at> debbugs.gnu.org (full text, mbox):
* gnu/packages/emacs-xyz.scm (emacs-ws-butler): Update to 1.3.
Change-Id: I5e50106efc32057f91bceff1a0b8fbbd2b1d7ef6
---
[source]: Switch to git-fetch, as "tests" folder is absent from tar file.
Note that upstream github.com/lewang/ws-butler repository is obsolete since 0.7.
gnu/packages/emacs-xyz.scm | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 320046063c..1d194a9993 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -23125,24 +23125,30 @@ (define-public emacs-hercules
(license license:gpl3+)))
(define-public emacs-ws-butler
- (package
- (name "emacs-ws-butler")
- (version "1.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://elpa.nongnu.org/nongnu/ws-butler-" version
- ".tar"))
- (sha256
- (base32 "1vy7g2ryg1drcz9zpn011d36zcd9a5b5yny5hwpjrllqj5dg73jx"))))
- (build-system emacs-build-system)
- (home-page "https://elpa.nongnu.org/nongnu/ws-butler.html")
- (synopsis "Unobtrusively remove trailing whitespace")
- (description
- "ws-butler automatically trims trailing whitespace characters on save.
+ (let ((commit "9ee5a7657a22e836618813c2e2b64a548d27d2ff"))
+ (package
+ (name "emacs-ws-butler")
+ (version "1.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/emacs/nongnu")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ivpgib2bxv7x6cp04mj8crc1a60d7c77jcc59sj14scq4jqbmjb"))))
+ (build-system emacs-build-system)
+ (arguments (list #:test-command
+ #~(list "emacs" "--batch" "-L" "."
+ "-l" "tests/run-test.el")))
+ (home-page "https://elpa.nongnu.org/nongnu/ws-butler.html")
+ (synopsis "Unobtrusively remove trailing whitespace")
+ (description
+ "ws-butler automatically trims trailing whitespace characters on save.
In contrast with other whitespace cleanup solutions, only modified lines are
trimmed.")
- (license license:gpl3+)))
+ (license license:gpl3+))))
(define-public emacs-opencl-mode
(package
base-commit: 871a5af3e02e8eb567055f5208ca39693e7114f1
--
2.49.0
Information forwarded
to
guix-patches <at> gnu.org
:
bug#77836
; Package
guix-patches
.
(Mon, 21 Apr 2025 12:09:03 GMT)
Full text and
rfc822 format available.
Message #26 received at 77836 <at> debbugs.gnu.org (full text, mbox):
Am Donnerstag, dem 17.04.2025 um 23:03 +0200 schrieb Cayetano Santos:
> * gnu/packages/emacs-xyz.scm (emacs-ws-butler): Update to 1.3.
>
> Change-Id: I5e50106efc32057f91bceff1a0b8fbbd2b1d7ef6
> ---
>
> [source]: Switch to git-fetch, as "tests" folder is absent from tar
> file.
>
> Note that upstream github.com/lewang/ws-butler repository is obsolete
> since 0.7.
>
> gnu/packages/emacs-xyz.scm | 38 ++++++++++++++++++++++--------------
> --
> 1 file changed, 22 insertions(+), 16 deletions(-)
>
> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
> index 320046063c..1d194a9993 100644
> --- a/gnu/packages/emacs-xyz.scm
> +++ b/gnu/packages/emacs-xyz.scm
> @@ -23125,24 +23125,30 @@ (define-public emacs-hercules
> (license license:gpl3+)))
>
> (define-public emacs-ws-butler
> - (package
> - (name "emacs-ws-butler")
> - (version "1.1")
> - (source
> - (origin
> - (method url-fetch)
> - (uri (string-append
> "https://elpa.nongnu.org/nongnu/ws-butler-" version
> - ".tar"))
> - (sha256
> - (base32
> "1vy7g2ryg1drcz9zpn011d36zcd9a5b5yny5hwpjrllqj5dg73jx"))))
> - (build-system emacs-build-system)
> - (home-page "https://elpa.nongnu.org/nongnu/ws-butler.html")
> - (synopsis "Unobtrusively remove trailing whitespace")
> - (description
> - "ws-butler automatically trims trailing whitespace characters
> on save.
> + (let ((commit "9ee5a7657a22e836618813c2e2b64a548d27d2ff"))
> + (package
> + (name "emacs-ws-butler")
> + (version "1.3")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://git.savannah.gnu.org/git/emacs/nongnu")
> + (commit commit)))
If this is a tagged commit, you may want to use the tag instead.
Otherwise, use git-version.
> + (file-name (git-file-name name version))
> + (sha256
> + (base32
> "0ivpgib2bxv7x6cp04mj8crc1a60d7c77jcc59sj14scq4jqbmjb"))))
> + (build-system emacs-build-system)
> + (arguments (list #:test-command
> + #~(list "emacs" "--batch" "-L" "."
> + "-l" "tests/run-test.el")))
> + (home-page "https://elpa.nongnu.org/nongnu/ws-butler.html")
> + (synopsis "Unobtrusively remove trailing whitespace")
> + (description
> + "ws-butler automatically trims trailing whitespace characters
> on save.
> In contrast with other whitespace cleanup solutions, only modified
> lines are
> trimmed.")
> - (license license:gpl3+)))
> + (license license:gpl3+))))
>
> (define-public emacs-opencl-mode
> (package
>
> base-commit: 871a5af3e02e8eb567055f5208ca39693e7114f1
> --
> 2.49.0
Cheers
Information forwarded
to
andrew <at> trop.in, csantosb <at> inventati.org, divya <at> subvertising.org, hako <at> ultrarare.space, ian <at> retrospec.tv, cox.katherine.e+guix <at> gmail.com, liliana.prikler <at> gmail.com, guix-patches <at> gnu.org
:
bug#77836
; Package
guix-patches
.
(Tue, 22 Apr 2025 12:56:03 GMT)
Full text and
rfc822 format available.
Message #29 received at 77836 <at> debbugs.gnu.org (full text, mbox):
From: Cayetano Santos via Guix-patches via <guix-patches <at> gnu.org>
* gnu/packages/emacs-xyz.scm (emacs-ws-butler): Update to 1.3.
Change-Id: I5e50106efc32057f91bceff1a0b8fbbd2b1d7ef6
Signed-off-by: Cayetano Santos <csantosb <at> inventati.org>
---
[source]: Switch to git-fetch, as "tests" folder is absent from tar file.
Note that upstream github.com/lewang/ws-butler repository is obsolete since 0.7.
gnu/packages/emacs-xyz.scm | 39 ++++++++++++++++++++++----------------
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ad9add40f5..0ea0033c8a 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -23147,24 +23147,31 @@ (define-public emacs-hercules
(license license:gpl3+)))
(define-public emacs-ws-butler
- (package
- (name "emacs-ws-butler")
- (version "1.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://elpa.nongnu.org/nongnu/ws-butler-" version
- ".tar"))
- (sha256
- (base32 "1vy7g2ryg1drcz9zpn011d36zcd9a5b5yny5hwpjrllqj5dg73jx"))))
- (build-system emacs-build-system)
- (home-page "https://elpa.nongnu.org/nongnu/ws-butler.html")
- (synopsis "Unobtrusively remove trailing whitespace")
- (description
- "ws-butler automatically trims trailing whitespace characters on save.
+ (let ((commit "9ee5a7657a22e836618813c2e2b64a548d27d2ff")
+ (revision "0"))
+ (package
+ (name "emacs-ws-butler")
+ (version (git-version "1.3" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/emacs/nongnu")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0ivpgib2bxv7x6cp04mj8crc1a60d7c77jcc59sj14scq4jqbmjb"))))
+ (build-system emacs-build-system)
+ (arguments (list #:test-command
+ #~(list "emacs" "--batch" "-L" "."
+ "-l" "tests/run-test.el")))
+ (home-page "https://elpa.nongnu.org/nongnu/ws-butler.html")
+ (synopsis "Unobtrusively remove trailing whitespace")
+ (description
+ "ws-butler automatically trims trailing whitespace characters on save.
In contrast with other whitespace cleanup solutions, only modified lines are
trimmed.")
- (license license:gpl3+)))
+ (license license:gpl3+))))
(define-public emacs-opencl-mode
(package
base-commit: 5e1ae1d2041255cb0da37071482f2af86ed84ba3
--
2.49.0
This bug report was last modified 1 day ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.