diff mbox series

[bug#43096] gnu: emacs-erc-status-sidebar: Update to 0.1-2.b589b742.

Message ID 20200829011157.3382-1-mike@rohleder.de
State Accepted
Headers show
Series [bug#43096] gnu: emacs-erc-status-sidebar: Update to 0.1-2.b589b742. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch success View Laminar job

Commit Message

Michael Rohleder Aug. 29, 2020, 1:11 a.m. UTC
* gnu/packages/emacs-xyz.scm (emacs-erc-status-sidebar): Update to 0.1-2.b589b742.
[propagated-inputs]: removed emacs-seq.
[license]: changed to gpl3+.
---
emacs-seq seems to make lots of trouble in emacs27 (max-lisp-eval-depth).
I think, we should remove that dep everywhere (it's provided by emacs) and
mark it as deprecated or also remove it.

 gnu/packages/emacs-xyz.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Comments

Brett Gilio Aug. 29, 2020, 1:45 a.m. UTC | #1
Michael Rohleder <mike@rohleder.de> writes:

> * gnu/packages/emacs-xyz.scm (emacs-erc-status-sidebar): Update to 0.1-2.b589b742.
> [propagated-inputs]: removed emacs-seq.
> [license]: changed to gpl3+.
> ---
> emacs-seq seems to make lots of trouble in emacs27 (max-lisp-eval-depth).
> I think, we should remove that dep everywhere (it's provided by emacs) and
> mark it as deprecated or also remove it.
>
>  gnu/packages/emacs-xyz.scm | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
> index 0755926ffe..7a6eb2e878 100644
> --- a/gnu/packages/emacs-xyz.scm
> +++ b/gnu/packages/emacs-xyz.scm
> @@ -3486,8 +3486,8 @@ IRC bouncer with ERC.")
>      (license license:expat)))
>  
>  (define-public emacs-erc-status-sidebar
> -  (let ((commit "ea4189a1dbfe60117359c36e681ad7c389e2968c")
> -        (revision "1"))
> +  (let ((commit "b589b74245591257c9e666bd5cd25812e04b7a34")
> +        (revision "2"))
>      (package
>        (name "emacs-erc-status-sidebar")
>        (version (git-version "0.1" revision commit))
> @@ -3499,9 +3499,8 @@ IRC bouncer with ERC.")
>                 (commit commit)))
>           (file-name (git-file-name name version))
>           (sha256
> -          (base32 "1hwlhzgx03z8891sblz56zdp8zj0izh72kxykgcnz5rrkyc3vfi3"))))
> +          (base32 "08fvr5ba6gb3y52sypbdj236nxr5rl95zgz1b120scz6xal7mysy"))))
>        (build-system emacs-build-system)
> -      (propagated-inputs `(("emacs-seq" ,emacs-seq)))
>        (home-page "https://github.com/drewbarbs/erc-status-sidebar")
>        (synopsis "Hexchat-like activity overview for ERC channels")
>        (description
> @@ -3509,7 +3508,7 @@ IRC bouncer with ERC.")
>  ERC, an Emacs client for IRC (Internet Relay Chat).  It relies on the
>  @code{erc-track} module, and displays all the same information
>  @code{erc-track} does in the mode line, but in an alternative format.")
> -      (license license:expat))))
> +      (license license:gpl3+))))
>  
>  (define-public emacs-shut-up
>    (package

I might be mistaken, but I think the license change belongs in a
separate patch.

Brett Gilio
ashish.is--- via Guix-patches" via Aug. 29, 2020, 1:51 a.m. UTC | #2
Brett Gilio 写道:
>> -      (license license:expat))))
>> +      (license license:gpl3+))))
>>  
>>  (define-public emacs-shut-up
>>    (package
>
> I might be mistaken, but I think the license change belongs in a
> separate patch.

Not if the licence actually changed between versions.

If it's correcting a previously incorrect licence in Guix, then 
indeed it does.

Kind regards,

T G-R
Brett Gilio Aug. 29, 2020, 1:58 a.m. UTC | #3
Tobias Geerinckx-Rice <me@tobias.gr> writes:

> Brett Gilio 写道:
>>> -      (license license:expat))))
>>> +      (license license:gpl3+))))
>>>   (define-public emacs-shut-up
>>>    (package
>>
>> I might be mistaken, but I think the license change belongs in a
>> separate patch.
>
> Not if the licence actually changed between versions.
>
> If it's correcting a previously incorrect licence in Guix, then indeed
> it does.
>
> Kind regards,
>
> T G-R

It's kind of a weird case where it is both? The LICENSE file has always
been GPL3, but the code header erroneously stated it as expat-style.

https://github.com/drewbarbs/erc-status-sidebar/commit/b589b74245591257c9e666bd5cd25812e04b7a34

I kind of lean on the side of a separate patch since the license never
really changed, but was an error both upstream and on our end as well.

Brett Gilio
Brett Gilio Aug. 29, 2020, 1:59 a.m. UTC | #4
Brett Gilio <brettg@gnu.org> writes:

> Tobias Geerinckx-Rice <me@tobias.gr> writes:
>
>> Brett Gilio 写道:
>>>> -      (license license:expat))))
>>>> +      (license license:gpl3+))))
>>>>   (define-public emacs-shut-up
>>>>    (package
>>>
>>> I might be mistaken, but I think the license change belongs in a
>>> separate patch.
>>
>> Not if the licence actually changed between versions.
>>
>> If it's correcting a previously incorrect licence in Guix, then indeed
>> it does.
>>
>> Kind regards,
>>
>> T G-R
>
> It's kind of a weird case where it is both? The LICENSE file has always
> been GPL3, but the code header erroneously stated it as expat-style.
>
> https://github.com/drewbarbs/erc-status-sidebar/commit/b589b74245591257c9e666bd5cd25812e04b7a34
>
> I kind of lean on the side of a separate patch since the license never
> really changed, but was an error both upstream and on our end as well.
>
> Brett Gilio

Actually, the change of commits may not be necessary at all. There is no
code changes between the commits, and the license file is intact.
Nicolas Goaziou Aug. 30, 2020, 9:22 a.m. UTC | #5
Hello,

Michael Rohleder <mike@rohleder.de> writes:

> I think, we should remove that dep everywhere (it's provided by emacs) and
> mark it as deprecated or also remove it.

I agree that the dependency should be removed from Emacs packages. The
emacs-seq package can be deprecated, indeed.

Regards,
Michael Rohleder Sept. 1, 2020, 3:48 a.m. UTC | #6
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
>> I think, we should remove that dep everywhere (it's provided by emacs) and
>> mark it as deprecated or also remove it.
>
> I agree that the dependency should be removed from Emacs packages. The
> emacs-seq package can be deprecated, indeed.

Pierre made a patch for bug #43138:
https://lists.gnu.org/archive/html/bug-guix/2020-08/msg00311.html
diff mbox series

Patch

diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0755926ffe..7a6eb2e878 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3486,8 +3486,8 @@  IRC bouncer with ERC.")
     (license license:expat)))
 
 (define-public emacs-erc-status-sidebar
-  (let ((commit "ea4189a1dbfe60117359c36e681ad7c389e2968c")
-        (revision "1"))
+  (let ((commit "b589b74245591257c9e666bd5cd25812e04b7a34")
+        (revision "2"))
     (package
       (name "emacs-erc-status-sidebar")
       (version (git-version "0.1" revision commit))
@@ -3499,9 +3499,8 @@  IRC bouncer with ERC.")
                (commit commit)))
          (file-name (git-file-name name version))
          (sha256
-          (base32 "1hwlhzgx03z8891sblz56zdp8zj0izh72kxykgcnz5rrkyc3vfi3"))))
+          (base32 "08fvr5ba6gb3y52sypbdj236nxr5rl95zgz1b120scz6xal7mysy"))))
       (build-system emacs-build-system)
-      (propagated-inputs `(("emacs-seq" ,emacs-seq)))
       (home-page "https://github.com/drewbarbs/erc-status-sidebar")
       (synopsis "Hexchat-like activity overview for ERC channels")
       (description
@@ -3509,7 +3508,7 @@  IRC bouncer with ERC.")
 ERC, an Emacs client for IRC (Internet Relay Chat).  It relies on the
 @code{erc-track} module, and displays all the same information
 @code{erc-track} does in the mode line, but in an alternative format.")
-      (license license:expat))))
+      (license license:gpl3+))))
 
 (define-public emacs-shut-up
   (package