unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#68571] [PATCH 1/2] gnu: emacs-minimal: Set upstream-name to “emacs”.
  2024-01-18 19:46 [bug#68571] [PATCH 0/2] Update Emacs to 29.2 Liliana Marie Prikler
@ 2024-01-18 19:44 ` Liliana Marie Prikler
  2024-01-18 19:45 ` [bug#68571] [PATCH 2/2] gnu: emacs-minimal: Update to 29.2 Liliana Marie Prikler
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 8+ messages in thread
From: Liliana Marie Prikler @ 2024-01-18 19:44 UTC (permalink / raw)
  To: 68571; +Cc: andrew, cox.katherine.e+guix, liliana.prikler

* gnu/packages/emacs.scm (emacs-minimal)[properties]: Add ‘upstream-name’.
---
 gnu/packages/emacs.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index b9d9e2b891..81f5c1fad5 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -281,7 +281,8 @@ (define-public emacs-minimal
            ;; Most variants support tree-sitter, so let's include it here.
            (search-path-specification
             (variable "TREE_SITTER_GRAMMAR_PATH")
-            (files '("lib/tree-sitter")))))))
+            (files '("lib/tree-sitter")))))
+    (properties `((upstream-name . "emacs")))))
 
 (define-public emacs-no-x
   (package/inherit emacs-minimal
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [bug#68571] [PATCH 2/2] gnu: emacs-minimal: Update to 29.2.
  2024-01-18 19:46 [bug#68571] [PATCH 0/2] Update Emacs to 29.2 Liliana Marie Prikler
  2024-01-18 19:44 ` [bug#68571] [PATCH 1/2] gnu: emacs-minimal: Set upstream-name to “emacs” Liliana Marie Prikler
@ 2024-01-18 19:45 ` Liliana Marie Prikler
  2024-01-21  4:49 ` [bug#68571] [PATCH 0/2] Update Emacs " Maxim Cournoyer
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 8+ messages in thread
From: Liliana Marie Prikler @ 2024-01-18 19:45 UTC (permalink / raw)
  To: 68571; +Cc: andrew, cox.katherine.e+guix, liliana.prikler

* gnu/packages/emacs.scm (emacs-minimal): Update to 29.2.
---
 gnu/packages/emacs.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 81f5c1fad5..b9ca59b6b5 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -99,14 +99,14 @@ (define (%emacs-modules build-system)
 (define-public emacs-minimal
   (package
     (name "emacs-minimal")
-    (version "29.1")
+    (version "29.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnu/emacs/emacs-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "009f7q08vg919b90k2jrsznq73s3n224avz80dd2y7i3rjjq3y6j"))
+                "1p3h4sz8da8vhix5140g2qkdy8mz11d7mmvsym5vy847k1428gbx"))
               (patches (search-patches "emacs-exec-path.patch"
                                        "emacs-fix-scheme-indent-function.patch"
                                        "emacs-native-comp-driver-options.patch"
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [bug#68571] [PATCH 0/2] Update Emacs to 29.2
@ 2024-01-18 19:46 Liliana Marie Prikler
  2024-01-18 19:44 ` [bug#68571] [PATCH 1/2] gnu: emacs-minimal: Set upstream-name to “emacs” Liliana Marie Prikler
                   ` (4 more replies)
  0 siblings, 5 replies; 8+ messages in thread
From: Liliana Marie Prikler @ 2024-01-18 19:46 UTC (permalink / raw)
  To: 68571; +Cc: andrew, cox.katherine.e+guix, liliana.prikler

Hi Guix,

this series updates emacs to 29.2.  Given that it's a minor release, it
should be fine on master once the the substitutes have built.  Anyhow,
it is currently based on master, because the ongoing work on emacs-team
is… ongoing, but in theory we could do the good old mergeroo.

WDYT?

Liliana Marie Prikler (2):
  gnu: emacs-minimal: Set upstream-name to “emacs”.
  gnu: emacs-minimal: Update to 29.2.

 gnu/packages/emacs.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


base-commit: bcc9cd1aaeb53c323b199623de4fafe8594d1a95
-- 
2.41.0





^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#68571] [PATCH 0/2] Update Emacs to 29.2
  2024-01-18 19:46 [bug#68571] [PATCH 0/2] Update Emacs to 29.2 Liliana Marie Prikler
  2024-01-18 19:44 ` [bug#68571] [PATCH 1/2] gnu: emacs-minimal: Set upstream-name to “emacs” Liliana Marie Prikler
  2024-01-18 19:45 ` [bug#68571] [PATCH 2/2] gnu: emacs-minimal: Update to 29.2 Liliana Marie Prikler
@ 2024-01-21  4:49 ` Maxim Cournoyer
  2024-01-21  8:38   ` bug#68571: " Liliana Marie Prikler
  2024-03-29  9:15 ` [bug#68571] Emacs 29.3 emergency security-fix release Adam Porter
  2024-03-29  9:17 ` [bug#68571] [PATCH 0/2] Update Emacs to 29.2 Cayetano Santos via Guix-patches via
  4 siblings, 1 reply; 8+ messages in thread
From: Maxim Cournoyer @ 2024-01-21  4:49 UTC (permalink / raw)
  To: Liliana Marie Prikler; +Cc: cox.katherine.e+guix, 68571, andrew

Hello,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Hi Guix,
>
> this series updates emacs to 29.2.  Given that it's a minor release, it
> should be fine on master once the the substitutes have built.  Anyhow,
> it is currently based on master, because the ongoing work on emacs-team
> is… ongoing, but in theory we could do the good old mergeroo.
>
> WDYT?
>
> Liliana Marie Prikler (2):
>   gnu: emacs-minimal: Set upstream-name to “emacs”.
>   gnu: emacs-minimal: Update to 29.2.
>

LGTM!  Thank you.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

-- 
Maxim




^ permalink raw reply	[flat|nested] 8+ messages in thread

* bug#68571: [PATCH 0/2] Update Emacs to 29.2
  2024-01-21  4:49 ` [bug#68571] [PATCH 0/2] Update Emacs " Maxim Cournoyer
@ 2024-01-21  8:38   ` Liliana Marie Prikler
  2024-01-21  9:12     ` [bug#68571] " Liliana Marie Prikler
  0 siblings, 1 reply; 8+ messages in thread
From: Liliana Marie Prikler @ 2024-01-21  8:38 UTC (permalink / raw)
  To: Maxim Cournoyer; +Cc: cox.katherine.e+guix, 68571-done, andrew

Am Samstag, dem 20.01.2024 um 23:49 -0500 schrieb Maxim Cournoyer:
> Hello,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > Hi Guix,
> > 
> > this series updates emacs to 29.2.  Given that it's a minor
> > release, it should be fine on master once the the substitutes have
> > built.  Anyhow, it is currently based on master, because the
> > ongoing work on emacs-team is… ongoing, but in theory we could do
> > the good old mergeroo.
> > 
> > WDYT?
> > 
> > Liliana Marie Prikler (2):
> >   gnu: emacs-minimal: Set upstream-name to “emacs”.
> >   gnu: emacs-minimal: Update to 29.2.
> > 
> 
> LGTM!  Thank you.
Thanks, pushed.

Cheers

(On that note, should I include the Reviewed-by: line next time?)




^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#68571] [PATCH 0/2] Update Emacs to 29.2
  2024-01-21  8:38   ` bug#68571: " Liliana Marie Prikler
@ 2024-01-21  9:12     ` Liliana Marie Prikler
  0 siblings, 0 replies; 8+ messages in thread
From: Liliana Marie Prikler @ 2024-01-21  9:12 UTC (permalink / raw)
  To: Maxim Cournoyer; +Cc: control, cox.katherine.e+guix, 68571, andrew

reopen 68571
thanks

Am Sonntag, dem 21.01.2024 um 09:38 +0100 schrieb Liliana Marie
Prikler:
> Thanks, pushed.
And unpushed because of too many rebuilds.

I'll push it to emacs-team separately, feel free to cherry-pick.




^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#68571] Emacs 29.3 emergency security-fix release
  2024-01-18 19:46 [bug#68571] [PATCH 0/2] Update Emacs to 29.2 Liliana Marie Prikler
                   ` (2 preceding siblings ...)
  2024-01-21  4:49 ` [bug#68571] [PATCH 0/2] Update Emacs " Maxim Cournoyer
@ 2024-03-29  9:15 ` Adam Porter
  2024-03-29  9:17 ` [bug#68571] [PATCH 0/2] Update Emacs to 29.2 Cayetano Santos via Guix-patches via
  4 siblings, 0 replies; 8+ messages in thread
From: Adam Porter @ 2024-03-29  9:15 UTC (permalink / raw)
  To: 68571

Hi,

Please note that Emacs 29.3 has been released, which is an emergency 
security-fix release (likely only affecting users who read email in 
Emacs using the Gnus message rendering mode (which, e.g. mu4e also 
does), but still important).

--Adam




^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#68571] [PATCH 0/2] Update Emacs to 29.2
  2024-01-18 19:46 [bug#68571] [PATCH 0/2] Update Emacs to 29.2 Liliana Marie Prikler
                   ` (3 preceding siblings ...)
  2024-03-29  9:15 ` [bug#68571] Emacs 29.3 emergency security-fix release Adam Porter
@ 2024-03-29  9:17 ` Cayetano Santos via Guix-patches via
  4 siblings, 0 replies; 8+ messages in thread
From: Cayetano Santos via Guix-patches via @ 2024-03-29  9:17 UTC (permalink / raw)
  To: 68571


Any chance to see 29.2 merged ? I just noticed 29.3 is out.




^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2024-03-29 12:46 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-18 19:46 [bug#68571] [PATCH 0/2] Update Emacs to 29.2 Liliana Marie Prikler
2024-01-18 19:44 ` [bug#68571] [PATCH 1/2] gnu: emacs-minimal: Set upstream-name to “emacs” Liliana Marie Prikler
2024-01-18 19:45 ` [bug#68571] [PATCH 2/2] gnu: emacs-minimal: Update to 29.2 Liliana Marie Prikler
2024-01-21  4:49 ` [bug#68571] [PATCH 0/2] Update Emacs " Maxim Cournoyer
2024-01-21  8:38   ` bug#68571: " Liliana Marie Prikler
2024-01-21  9:12     ` [bug#68571] " Liliana Marie Prikler
2024-03-29  9:15 ` [bug#68571] Emacs 29.3 emergency security-fix release Adam Porter
2024-03-29  9:17 ` [bug#68571] [PATCH 0/2] Update Emacs to 29.2 Cayetano Santos via Guix-patches via

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).