[PATCH] gnu: emacs-erc-status-sidebar: Update to 0.1-2.b589b742.

DoneSubmitted by Michael Rohleder.
Details
5 participants
  • Brett Gilio
  • Ludovic Courtès
  • Nicolas Goaziou
  • Tobias Geerinckx-Rice
  • Michael Rohleder
Owner
unassigned
Severity
normal
M
M
Michael Rohleder wrote on 29 Aug 2020 03:11
(address . guix-patches@gnu.org)(name . Michael Rohleder)(address . mike@rohleder.de)
20200829011157.3382-1-mike@rohleder.de
* 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(-)

Toggle diff (37 lines)
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
-- 
2.28.0
B
B
Brett Gilio wrote on 29 Aug 2020 03:45
(name . Michael Rohleder)(address . mike@rohleder.de)(address . 43096@debbugs.gnu.org)
87h7sm6x7v.fsf@gnu.org
Michael Rohleder <mike@rohleder.de> writes:

Toggle quote (47 lines)
> * 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
T
T
Tobias Geerinckx-Rice wrote on 29 Aug 2020 03:51
(name . Brett Gilio)(address . brettg@gnu.org)
87ft86kynv.fsf@nckx
Brett Gilio 写道:
Toggle quote (9 lines)
>> - (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
-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQT12iAyS4c9C3o4dnINsP+IT1VteQUCX0m0hAAKCRANsP+IT1Vt
efwyAP0ThqE9zhBQcVeitnTs12OvdBBCqcAPAMSj+w9Muf2QOgEAhnfd/uPKc7in
IupWfW4uesjnk2G+CW/HJr7avsZIrg4=
=PyX1
-----END PGP SIGNATURE-----

B
B
Brett Gilio wrote on 29 Aug 2020 03:58
(name . Tobias Geerinckx-Rice)(address . me@tobias.gr)
87y2ly5i33.fsf@gnu.org
Tobias Geerinckx-Rice <me@tobias.gr> writes:

Toggle quote (18 lines)
> 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.


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
B
B
Brett Gilio wrote on 29 Aug 2020 03:59
(name . Tobias Geerinckx-Rice)(address . me@tobias.gr)
87sgc65i01.fsf@gnu.org
Brett Gilio <brettg@gnu.org> writes:

Toggle quote (30 lines)
> 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.
M
M
Michael Rohleder wrote on 30 Aug 2020 03:29
(name . Brett Gilio)(address . brettg@gnu.org)
87y2lw3oqb.fsf@rohleder.de
Hey Brett, hey Tobias,

Brett Gilio <brettg@gnu.org> writes:
Toggle quote (14 lines)
>> 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.
>

Ok, here are 2 patches, one for the license and one for removing
emacs-seq:
From 340699d5ceb2db40824a403399556536f2e07e23 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@rohleder.de>
Date: Sun, 30 Aug 2020 02:48:32 +0200
Subject: [PATCH] gnu: emacs-erc-status-sidebar: Correct license.

* gnu/packages/emacs-xyz.scm (emacs-erc-status-sidebar)[license]: Set to GPL3+.
---
gnu/packages/emacs-xyz.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (15 lines)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ff789ffedf..9975fc8366 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3509,7 +3509,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
-- 
2.28.0
From 028021a0654c3a82d951ec991d63d392c421324d Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@rohleder.de>
Date: Sun, 30 Aug 2020 03:03:48 +0200
Subject: [PATCH] gnu: emacs-erc-status-sidebar: Fix for emacs27.

* gnu/packages/emacs-xyz.scm (emacs-erc-status-sidebar)[propagated-inputs]: remove emacs-seq.

This package works well with the seq library that is provided with emacs.
Current emacs-seq (0.20) is broken for emacs27. A fix seems on it's
---
gnu/packages/emacs-xyz.scm | 1 -
1 file changed, 1 deletion(-)

Toggle diff (14 lines)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 9975fc8366..a2427112aa 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -3501,7 +3501,6 @@ IRC bouncer with ERC.")
          (sha256
           (base32 "1hwlhzgx03z8891sblz56zdp8zj0izh72kxykgcnz5rrkyc3vfi3"))))
       (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
-- 
2.28.0
--
"How should I know if it works? That's what beta testers are for. I only
coded it."
(Attributed to Linus Torvalds, somewhere in a posting)
-----BEGIN PGP SIGNATURE-----

iQFFBAEBCAAvFiEEdV4t5dDVhcUueCgwfHr/vv7yyyUFAl9LAQwRHG1pa2VAcm9o
bGVkZXIuZGUACgkQfHr/vv7yyyVMjgf+IOC0WR1Na6xawO8W7R21uFu0qxxDhZya
PAurAPS6XwvRyLFoHswx/JT9ZtVLvI6U3PSxPbuiq5u64/ozbb/bq+M+0CGHSMC8
h+zvqSR2RAfRzD78pIayP/On8mdD+sxUMPcvMU94wL0qK0x7GD65kXkuICDf0+kK
N4vfbR64dTz4EslhshoI1Hh4qwdFvStcxyz42mbj4kIxQcXm9MZCYZYg4CXQoVbC
do4iwpl1D0qJWr/DQk3cfH0DJNSuvU5m4clhZ+C0NuJS9rv/RobWgqnwG2dkgg+e
O5G7SsEQRMEmnpBvTEVhfjsnyo+zMyU23BqNQyTjqiPT3mMy3WC7uw==
=0n+i
-----END PGP SIGNATURE-----

N
N
Nicolas Goaziou wrote on 30 Aug 2020 11:22
(name . Michael Rohleder)(address . mike@rohleder.de)(address . 43096@debbugs.gnu.org)
87d038lc7l.fsf@nicolasgoaziou.fr
Hello,

Michael Rohleder <mike@rohleder.de> writes:

Toggle quote (3 lines)
> 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,
--
Nicolas Goaziou
M
M
Michael Rohleder wrote on 1 Sep 2020 05:48
(name . Nicolas Goaziou)(address . mail@nicolasgoaziou.fr)(address . 43096@debbugs.gnu.org)
87imcycg2e.fsf@rohleder.de
Nicolas Goaziou <mail@nicolasgoaziou.fr> writes:
Toggle quote (6 lines)
>> 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:

--
There are two reasons why we dont trust people.
First - we dont know them.
Second - we know them.
-----BEGIN PGP SIGNATURE-----

iQFFBAEBCAAvFiEEdV4t5dDVhcUueCgwfHr/vv7yyyUFAl9NxKoRHG1pa2VAcm9o
bGVkZXIuZGUACgkQfHr/vv7yyyVsOgf+LeFqVSzDxEQLIh90Zfn8B34R5HQn+cvZ
MBFg6aWuUHochW5jP9aKbfwwI83oKo/zKNZGWZub9pbwN+5puiX1RQntYNkGfaX5
26PEqH9kNM8U2JQIdAk3XQROuzWBbb+vCx4Z9A1PnV9gLthugiI9zVC96HT2TuXI
hzRiGnoiTAeXExzm98M59OU7QodR5swy3ZYTyxM7pFZL0BjUq2kdYSWs8U9boUMs
Jnsjuw0vvSSlhUTIUeZKGFk9YnmLTiiNq1AQwkPDHAKauePRN0D7LEzhuwkUmBj6
U4R+yuMkeRftoEe0MtqMh/936nsIjWIEhfJDd5f+Jk5Tj+SWEEGm7Q==
=sq/L
-----END PGP SIGNATURE-----

L
L
Ludovic Courtès wrote on 18 Dec 2020 14:18
(name . Michael Rohleder)(address . mike@rohleder.de)
87wnxfckwn.fsf@gnu.org
Hi!

Michael Rohleder <mike@rohleder.de> skribis:

Toggle quote (7 lines)
> From 340699d5ceb2db40824a403399556536f2e07e23 Mon Sep 17 00:00:00 2001
> From: Michael Rohleder <mike@rohleder.de>
> Date: Sun, 30 Aug 2020 02:48:32 +0200
> Subject: [PATCH] gnu: emacs-erc-status-sidebar: Correct license.
>
> * gnu/packages/emacs-xyz.scm (emacs-erc-status-sidebar)[license]: Set to GPL3+.

Applied, thanks!

The emacs-seq bit is already done, as discussed on IRC.

Ludo’.
Closed
?
Your comment

This issue is archived.

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