[PATCH 0/2] Update magit to 4.3.0

  • Done
  • quality assurance status badge
Details
3 participants
  • ashish.is
  • Cayetano Santos
  • Maxim Cournoyer
Owner
unassigned
Submitted by
ashish.is
Severity
normal
A
A
ashish.is wrote 6 days ago
(address . guix-patches@gnu.org)(name . Ashish SHUKLA)(address . ashish.is@lostca.se)
cover.1738708382.git.ashish.is@lostca.se
From: Ashish SHUKLA <ashish.is@lostca.se>

This patch series updates magit to 4.3.0, along with the dependencies.

Ashish SHUKLA (2):
gnu: emacs-llama: Update to 0.6.0.
gnu: emacs-magit: Update to 4.3.0.

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


base-commit: 5a897c5c95a81278b044c18d962d3bd83131ba06
--
2.48.1
A
A
ashish.is wrote 6 days ago
[PATCH 2/2] gnu: emacs-magit: Update to 4.3.0.
(address . 76062@debbugs.gnu.org)(name . Ashish SHUKLA)(address . ashish.is@lostca.se)
6abb51fb865c7c29cc4ccacebd3f273498603d7c.1738708382.git.ashish.is@lostca.se
From: Ashish SHUKLA <ashish.is@lostca.se>

* gnu/packages/emacs-xyz.scm (emacs-magit): Update to 4.3.0.

Change-Id: I7a7f24c066b01ceee24f9638f85105d4dc7827a6
---
gnu/packages/emacs-xyz.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Toggle diff (33 lines)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0afef8ac9e..bfb5752319 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1823,7 +1823,7 @@ (define-public emacs-llm
(define-public emacs-magit
(package
(name "emacs-magit")
- (version "4.2.0")
+ (version "4.3.0")
(source
(origin
(method git-fetch)
@@ -1832,7 +1832,7 @@ (define-public emacs-magit
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0zmrd6xlrvlr0i1a75xwlknmyx4hvpfxaqjkl61n12gd8598ji1j"))))
+ (base32 "1xz68154qmik4xs3ldl1gv87rb3famgd73k0174xbsr48d40ccyg"))))
(build-system emacs-build-system)
(arguments
(list
@@ -1897,7 +1897,7 @@ (define-public emacs-magit
(propagated-inputs
;; Note: the 'git-commit' and 'magit-section' dependencies are part of
;; magit itself.
- (list emacs-compat emacs-dash emacs-transient emacs-with-editor))
+ (list emacs-compat emacs-dash emacs-transient emacs-with-editor emacs-llama))
(home-page "https://magit.vc/")
(synopsis "Emacs interface for the Git version control system")
(description
--
2.48.1
A
A
ashish.is wrote 6 days ago
[PATCH 1/2] gnu: emacs-llama: Update to 0.6.0.
(address . 76062@debbugs.gnu.org)(name . Ashish SHUKLA)(address . ashish.is@lostca.se)
0f40f22cefcea1eff18bb499af949f0c785ae783.1738708382.git.ashish.is@lostca.se
From: Ashish SHUKLA <ashish.is@lostca.se>

* gnu/packages/emacs-xyz.scm (emacs-llama): Update to 0.6.0.

Change-Id: I713ffb3549edc8325d19e31e90f2a06b678ea0b6
---
gnu/packages/emacs-xyz.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e50622195b..0afef8ac9e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1771,7 +1771,7 @@ (define-public emacs-libgit
(define-public emacs-llama
(package
(name "emacs-llama")
- (version "0.5.0")
+ (version "0.6.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1780,7 +1780,7 @@ (define-public emacs-llama
(file-name (git-file-name name version))
(sha256
(base32
- "1zb3iqb1nks2y9i1033x4pa0kb7nb4jqwrcrkqrsq3w612213hkd"))))
+ "0f2v1fw5iahlh0ypbwxfpav48h43h0zqqmicgs2hg7r251ss2j8j"))))
(build-system emacs-build-system)
(arguments
(list #:tests? #true
--
2.48.1
C
C
Cayetano Santos wrote 6 days ago
control message for bug #76062
(name . GNU bug tracker automated control server)(address . control@debbugs.gnu.org)
877c64akzf.fsf@inventati.org
user guix
usertag 76062 + waiting-on-contributor
thanks

Guix QA review form submission:

Magit doesn’t depend on dash anymore, see:


Could you remove it from propagated inputs array ?

Thanks !

--
Cayetano Santos
FingerPrint: CCB8 1842 F9D7 058E CD67 377A BF5C DF4D F6BF 6682
-----BEGIN PGP SIGNATURE-----

iI0EARYKADUWIQTMuBhC+dcFjs1nN3q/XN9N9r9mggUCZ6MYRBccY3NhbnRvc2JA
aW52ZW50YXRpLm9yZwAKCRC/XN9N9r9mgiFhAP0b4viaB7BMTZhtukL32DyKvKvW
0wWpZlk63jetRY6PVQD/ZC0tqCNBZwK/yxtlY1oc5cWLz4ih9uXOqpugutlUagw=
=Mq3B
-----END PGP SIGNATURE-----

A
A
ashish.is wrote 5 days ago
[PATCH v2 1/2] gnu: emacs-llama: Update to 0.6.0.
(address . 76062@debbugs.gnu.org)(name . Ashish SHUKLA)(address . ashish.is@lostca.se)
0f40f22cefcea1eff18bb499af949f0c785ae783.1738746871.git.ashish.is@lostca.se
From: Ashish SHUKLA <ashish.is@lostca.se>

* gnu/packages/emacs-xyz.scm (emacs-llama): Update to 0.6.0.

Change-Id: I713ffb3549edc8325d19e31e90f2a06b678ea0b6
---
gnu/packages/emacs-xyz.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (26 lines)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index e50622195b..0afef8ac9e 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1771,7 +1771,7 @@ (define-public emacs-libgit
(define-public emacs-llama
(package
(name "emacs-llama")
- (version "0.5.0")
+ (version "0.6.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1780,7 +1780,7 @@ (define-public emacs-llama
(file-name (git-file-name name version))
(sha256
(base32
- "1zb3iqb1nks2y9i1033x4pa0kb7nb4jqwrcrkqrsq3w612213hkd"))))
+ "0f2v1fw5iahlh0ypbwxfpav48h43h0zqqmicgs2hg7r251ss2j8j"))))
(build-system emacs-build-system)
(arguments
(list #:tests? #true

base-commit: 5a897c5c95a81278b044c18d962d3bd83131ba06
--
2.48.1
A
A
ashish.is wrote 5 days ago
[PATCH v2 2/2] gnu: emacs-magit: Update to 4.3.0.
(address . 76062@debbugs.gnu.org)(name . Ashish SHUKLA)(address . ashish.is@lostca.se)
7556002fb1f310e3b8da490d11a790f8a95aa21b.1738746871.git.ashish.is@lostca.se
From: Ashish SHUKLA <ashish.is@lostca.se>

* gnu/packages/emacs-xyz.scm (emacs-magit): Update to 4.3.0.
[propagated-inputs]: Add emacs-llama, and remove emacs-dash.

Change-Id: I7a7f24c066b01ceee24f9638f85105d4dc7827a6
---
Hi,

Thanks for the review. I've also updated the commit message which did not meet standards.

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

Toggle diff (33 lines)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index 0afef8ac9e..78d12787d5 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -1823,7 +1823,7 @@ (define-public emacs-llm
(define-public emacs-magit
(package
(name "emacs-magit")
- (version "4.2.0")
+ (version "4.3.0")
(source
(origin
(method git-fetch)
@@ -1832,7 +1832,7 @@ (define-public emacs-magit
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0zmrd6xlrvlr0i1a75xwlknmyx4hvpfxaqjkl61n12gd8598ji1j"))))
+ (base32 "1xz68154qmik4xs3ldl1gv87rb3famgd73k0174xbsr48d40ccyg"))))
(build-system emacs-build-system)
(arguments
(list
@@ -1897,7 +1897,7 @@ (define-public emacs-magit
(propagated-inputs
;; Note: the 'git-commit' and 'magit-section' dependencies are part of
;; magit itself.
- (list emacs-compat emacs-dash emacs-transient emacs-with-editor))
+ (list emacs-compat emacs-transient emacs-with-editor emacs-llama))
(home-page "https://magit.vc/")
(synopsis "Emacs interface for the Git version control system")
(description
--
2.48.1
C
C
Cayetano Santos wrote 5 days ago
control message for bug #76062
(name . GNU bug tracker automated control server)(address . control@debbugs.gnu.org)
87v7toxu14.fsf@inventati.org
user guix
usertag 76062 + reviewed-looks-good
thanks

Guix QA review form submission:

Items marked as checked:

- Commit messages
- Package builds
- Lint warnings
- Package tests
- List dependent packages build

package emacs-magit-stgit cannot build after this patch, but problem
comes from upstream repository, which needs to be updated

--
Cayetano Santos
.
gpg: CCB8 1842 F9D7 058E CD67 377A BF5C DF4D F6BF 6682
key: meta.sr.ht/~csantosb.pgp
-----BEGIN PGP SIGNATURE-----

iI0EARYKADUWIQTMuBhC+dcFjs1nN3q/XN9N9r9mggUCZ6OKtxccY3NhbnRvc2JA
aW52ZW50YXRpLm9yZwAKCRC/XN9N9r9mgj9mAPwLu7jlJ4W3SFxR7NaCoNJqz0Vn
Wo6mpjzjOXZJpdWodgD/RrQ8+/D7apJtNMIXjTr+HsKV3brMQHiz090hi9AkMQA=
=6+FI
-----END PGP SIGNATURE-----

M
M
Maxim Cournoyer wrote 2 days ago
Re: [bug#76062] [PATCH v2 2/2] gnu: emacs-magit: Update to 4.3.0.
(address . ashish.is@lostca.se)
877c608o7r.fsf@gmail.com
Hi,

ashish.is@lostca.se writes:

Toggle quote (5 lines)
> From: Ashish SHUKLA <ashish.is@lostca.se>
>
> * gnu/packages/emacs-xyz.scm (emacs-magit): Update to 4.3.0.
> [propagated-inputs]: Add emacs-llama, and remove emacs-dash.

Series applied! Thanks to Cayetano for the review.

--
Thanks,
Maxim
Closed
?
Your comment

Commenting via the web interface is currently disabled.

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

To respond to this issue using the mumi CLI, first switch to it
mumi current 76062
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