* [bug#45050] [PATCH] gnu: Update emacs-guix to temporary repository.
@ 2020-12-05 5:21 John Soo
2020-12-05 5:24 ` [bug#45050] Oops! John Soo
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: John Soo @ 2020-12-05 5:21 UTC (permalink / raw)
To: 45050
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
Hello Guix,
Since 1.2 was released, I can update emacs-guix to use my repository
with patches to make it work again. It should be updated again when
guix.el has a new home.
Kindly,
John
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Update-emacs-guix.patch --]
[-- Type: text/x-patch, Size: 3700 bytes --]
From 28abdd7140c31425f6add54470ad683bc46e8de7 Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Thu, 12 Nov 2020 23:04:27 -0800
Subject: [PATCH] gnu: Update emacs-guix.
* gnu/packages/emacs-xyz.scm (emacs-guix): Update it, [inputs] Use guile for
guix.
---
gnu/packages/emacs-xyz.scm | 70 ++++++++++++++++++++------------------
1 file changed, 36 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index bf2312eb49..9523031095 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2795,41 +2795,43 @@ type, for example: packages, buffers, files, etc.")
(license license:gpl3+)))
(define-public emacs-guix
- (let ((commit "58a840d0671091e3064e36244790ef8839da87d6")
- (revision "2"))
+ (let* ((commit "a694fdbcedb6edd2239a31d326e475c763ee32f8")
+ (revision "1"))
(package
- (name "emacs-guix")
- (version (git-version "0.5.2" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.com/emacs-guix/emacs-guix")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1qnr5sixmvrhr9rinrhfy7sy20mikjvvwbdixwkbx30qpcdwgwj1"))))
- (build-system gnu-build-system)
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("pkg-config" ,pkg-config)
- ("texinfo" ,texinfo)
- ("emacs" ,emacs-minimal)))
- (inputs
- `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
- ("guix" ,guix)))
- (propagated-inputs
- `(("geiser" ,emacs-geiser)
- ("guile-gcrypt" ,guile-gcrypt)
- ("dash" ,emacs-dash)
- ("bui" ,emacs-bui)
- ("edit-indirect" ,emacs-edit-indirect)
- ("magit-popup" ,emacs-magit-popup)))
- (home-page "https://emacs-guix.gitlab.io/website/")
- (synopsis "Emacs interface for GNU Guix")
- (description
- "Emacs-Guix provides a visual interface, tools and features for the GNU
+ (name "emacs-guix")
+ (version (git-version "0.5.2" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ ;; TODO: Use the official version when it has a new home
+ (url "https://github.com/jsoo1/guix.el")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1pqw7zbgxzwpig4xr0izc3z8h80c72i6bl5yi12br0d7aq6dbkvj"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("pkg-config" ,pkg-config)
+ ("texinfo" ,texinfo)
+ ("emacs" ,emacs-minimal)))
+ (inputs
+ `(("guile"
+ ,@(assoc-ref (package-native-inputs guix) "guile"))
+ ("guix" ,guix)))
+ (propagated-inputs
+ `(("geiser" ,emacs-geiser)
+ ("guile-gcrypt" ,guile-gcrypt)
+ ("dash" ,emacs-dash)
+ ("bui" ,emacs-bui)
+ ("edit-indirect" ,emacs-edit-indirect)
+ ("magit-popup" ,emacs-magit-popup)))
+ (home-page "https://emacs-guix.gitlab.io/website/")
+ (synopsis "Emacs interface for GNU Guix")
+ (description
+ "Emacs-Guix provides a visual interface, tools and features for the GNU
Guix package manager. Particularly, it allows you to do various package
management tasks from Emacs. To begin with, run @code{M-x guix-about} or
@code{M-x guix-help} command.")
--
2.29.2
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0001-gnu-Update-emacs-guix.patch --]
[-- Type: text/x-patch, Size: 3700 bytes --]
From 28abdd7140c31425f6add54470ad683bc46e8de7 Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Thu, 12 Nov 2020 23:04:27 -0800
Subject: [PATCH] gnu: Update emacs-guix.
* gnu/packages/emacs-xyz.scm (emacs-guix): Update it, [inputs] Use guile for
guix.
---
gnu/packages/emacs-xyz.scm | 70 ++++++++++++++++++++------------------
1 file changed, 36 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index bf2312eb49..9523031095 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2795,41 +2795,43 @@ type, for example: packages, buffers, files, etc.")
(license license:gpl3+)))
(define-public emacs-guix
- (let ((commit "58a840d0671091e3064e36244790ef8839da87d6")
- (revision "2"))
+ (let* ((commit "a694fdbcedb6edd2239a31d326e475c763ee32f8")
+ (revision "1"))
(package
- (name "emacs-guix")
- (version (git-version "0.5.2" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.com/emacs-guix/emacs-guix")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1qnr5sixmvrhr9rinrhfy7sy20mikjvvwbdixwkbx30qpcdwgwj1"))))
- (build-system gnu-build-system)
- (native-inputs
- `(("autoconf" ,autoconf)
- ("automake" ,automake)
- ("pkg-config" ,pkg-config)
- ("texinfo" ,texinfo)
- ("emacs" ,emacs-minimal)))
- (inputs
- `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
- ("guix" ,guix)))
- (propagated-inputs
- `(("geiser" ,emacs-geiser)
- ("guile-gcrypt" ,guile-gcrypt)
- ("dash" ,emacs-dash)
- ("bui" ,emacs-bui)
- ("edit-indirect" ,emacs-edit-indirect)
- ("magit-popup" ,emacs-magit-popup)))
- (home-page "https://emacs-guix.gitlab.io/website/")
- (synopsis "Emacs interface for GNU Guix")
- (description
- "Emacs-Guix provides a visual interface, tools and features for the GNU
+ (name "emacs-guix")
+ (version (git-version "0.5.2" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ ;; TODO: Use the official version when it has a new home
+ (url "https://github.com/jsoo1/guix.el")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1pqw7zbgxzwpig4xr0izc3z8h80c72i6bl5yi12br0d7aq6dbkvj"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("pkg-config" ,pkg-config)
+ ("texinfo" ,texinfo)
+ ("emacs" ,emacs-minimal)))
+ (inputs
+ `(("guile"
+ ,@(assoc-ref (package-native-inputs guix) "guile"))
+ ("guix" ,guix)))
+ (propagated-inputs
+ `(("geiser" ,emacs-geiser)
+ ("guile-gcrypt" ,guile-gcrypt)
+ ("dash" ,emacs-dash)
+ ("bui" ,emacs-bui)
+ ("edit-indirect" ,emacs-edit-indirect)
+ ("magit-popup" ,emacs-magit-popup)))
+ (home-page "https://emacs-guix.gitlab.io/website/")
+ (synopsis "Emacs interface for GNU Guix")
+ (description
+ "Emacs-Guix provides a visual interface, tools and features for the GNU
Guix package manager. Particularly, it allows you to do various package
management tasks from Emacs. To begin with, run @code{M-x guix-about} or
@code{M-x guix-help} command.")
--
2.29.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [bug#45050] Oops!
2020-12-05 5:21 [bug#45050] [PATCH] gnu: Update emacs-guix to temporary repository John Soo
@ 2020-12-05 5:24 ` John Soo
2020-12-07 16:01 ` [bug#45050] [PATCH] gnu: Update emacs-guix to temporary repository zimoun
2020-12-11 17:47 ` Ludovic Courtès
2 siblings, 0 replies; 8+ messages in thread
From: John Soo @ 2020-12-05 5:24 UTC (permalink / raw)
To: 45050
[-- Attachment #1: Type: text/plain, Size: 78 bytes --]
Just one of those patches is required, sorry!
[-- Attachment #2: Type: text/html, Size: 359 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#45050] [PATCH] gnu: Update emacs-guix to temporary repository.
2020-12-05 5:21 [bug#45050] [PATCH] gnu: Update emacs-guix to temporary repository John Soo
2020-12-05 5:24 ` [bug#45050] Oops! John Soo
@ 2020-12-07 16:01 ` zimoun
2020-12-07 16:15 ` John Soo
2020-12-11 17:47 ` Ludovic Courtès
2 siblings, 1 reply; 8+ messages in thread
From: zimoun @ 2020-12-07 16:01 UTC (permalink / raw)
To: John Soo, 45050
Hi John,
On Fri, 04 Dec 2020 at 21:21, John Soo <jsoo1@asu.edu> wrote:
> Hello Guix,
>
> Since 1.2 was released, I can update emacs-guix to use my repository
> with patches to make it work again. It should be updated again when
> guix.el has a new home.
News about the new home?
> + (uri (git-reference
> + ;; TODO: Use the official version when it has a new home
> + (url "https://github.com/jsoo1/guix.el")
Is it the most recent version where patches are applied?
Cheers,
simon
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#45050] [PATCH] gnu: Update emacs-guix to temporary repository.
2020-12-07 16:01 ` [bug#45050] [PATCH] gnu: Update emacs-guix to temporary repository zimoun
@ 2020-12-07 16:15 ` John Soo
2020-12-07 16:55 ` zimoun
0 siblings, 1 reply; 8+ messages in thread
From: John Soo @ 2020-12-07 16:15 UTC (permalink / raw)
To: zimoun; +Cc: 45050
[-- Attachment #1: Type: text/plain, Size: 412 bytes --]
Hi zimoun,
I still haven’t heard from the original maintainer about moving the sources to savannah. I sent an email maybe a week or two ago.
The source I added here does have patches applied to make it work. My goal is to switch the source again when it ends up wherever it finally finds a new official location.
What do you think?
- John
[-- Attachment #2: Type: text/html, Size: 653 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#45050] [PATCH] gnu: Update emacs-guix to temporary repository.
2020-12-07 16:15 ` John Soo
@ 2020-12-07 16:55 ` zimoun
0 siblings, 0 replies; 8+ messages in thread
From: zimoun @ 2020-12-07 16:55 UTC (permalink / raw)
To: John Soo; +Cc: 45050
Hi,
On Mon, 07 Dec 2020 at 08:15, John Soo <jsoo1@asu.edu> wrote:
> The source I added here does have patches applied to make it work. My
> goal is to switch the source again when it ends up wherever it finally
> finds a new official location.
Sounds good!
Cheers,
simon
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#45050] [PATCH] gnu: Update emacs-guix to temporary repository.
2020-12-05 5:21 [bug#45050] [PATCH] gnu: Update emacs-guix to temporary repository John Soo
2020-12-05 5:24 ` [bug#45050] Oops! John Soo
2020-12-07 16:01 ` [bug#45050] [PATCH] gnu: Update emacs-guix to temporary repository zimoun
@ 2020-12-11 17:47 ` Ludovic Courtès
2020-12-11 20:27 ` John Soo
2 siblings, 1 reply; 8+ messages in thread
From: Ludovic Courtès @ 2020-12-11 17:47 UTC (permalink / raw)
To: John Soo; +Cc: 45050
Hi!
John Soo <jsoo1@asu.edu> skribis:
>>From 28abdd7140c31425f6add54470ad683bc46e8de7 Mon Sep 17 00:00:00 2001
> From: John Soo <jsoo1@asu.edu>
> Date: Thu, 12 Nov 2020 23:04:27 -0800
> Subject: [PATCH] gnu: Update emacs-guix.
>
> * gnu/packages/emacs-xyz.scm (emacs-guix): Update it, [inputs] Use guile for
> guix.
If it fixes one of the bugs in the tracker, we can mention it in the
commit log with “Fixes <https://bugs.gnu.org/XYZ>.”
> (define-public emacs-guix
> - (let ((commit "58a840d0671091e3064e36244790ef8839da87d6")
> - (revision "2"))
> + (let* ((commit "a694fdbcedb6edd2239a31d326e475c763ee32f8")
> + (revision "1"))
Please increment the revision number rather than decrement it.
> (package
> - (name "emacs-guix")
> - (version (git-version "0.5.2" revision commit))
Please don’t reindent, the original formatting was fine. :-)
Could you send an updated patch?
I guess it’s fine to use your repo until we hear from Alex Kost.
Thanks for taking care of this!
Ludo’.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [bug#45050] [PATCH] gnu: Update emacs-guix to temporary repository.
2020-12-11 17:47 ` Ludovic Courtès
@ 2020-12-11 20:27 ` John Soo
2020-12-12 17:40 ` bug#45050: " Ludovic Courtès
0 siblings, 1 reply; 8+ messages in thread
From: John Soo @ 2020-12-11 20:27 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 45050
[-- Attachment #1: Type: text/plain, Size: 1061 bytes --]
Hello!
Ludovic Courtès <ludo@gnu.org> writes:
>> * gnu/packages/emacs-xyz.scm (emacs-guix): Update it, [inputs] Use guile for
>> guix.
>
> If it fixes one of the bugs in the tracker, we can mention it in the
> commit log with “Fixes <https://bugs.gnu.org/XYZ>.”
Alright, done.
>> (define-public emacs-guix
>> - (let ((commit "58a840d0671091e3064e36244790ef8839da87d6")
>> - (revision "2"))
>> + (let* ((commit "a694fdbcedb6edd2239a31d326e475c763ee32f8")
>> + (revision "1"))
>
> Please increment the revision number rather than decrement it.
Ah yes, sorry I thought it would be the "revision at commit". I bumped
it to rev 3.
>> (package
>> - (name "emacs-guix")
>> - (version (git-version "0.5.2" revision commit))
>
> Please don’t reindent, the original formatting was fine. :-)
Oh oops, sorry. I think I forgot to reindent after a previous revision.
> I guess it’s fine to use your repo until we hear from Alex Kost.
Hopefully soon :)
Thanks for your review,
John
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Update-emacs-guix.patch --]
[-- Type: text/x-patch, Size: 2099 bytes --]
From 4fd99ba6fa6ef61e1077f1fcad6b5d56bbbbf69a Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Thu, 12 Nov 2020 23:04:27 -0800
Subject: [PATCH] gnu: Update emacs-guix.
* gnu/packages/emacs-xyz.scm (emacs-guix): Update it, [inputs] Use guile for
guix.
* Fixes https://bugs.gnu.org/44062
---
gnu/packages/emacs-xyz.scm | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index ceb99f402d..5798af80d6 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2795,20 +2795,21 @@ type, for example: packages, buffers, files, etc.")
(license license:gpl3+)))
(define-public emacs-guix
- (let ((commit "58a840d0671091e3064e36244790ef8839da87d6")
- (revision "2"))
+ (let* ((commit "a694fdbcedb6edd2239a31d326e475c763ee32f8")
+ (revision "3"))
(package
(name "emacs-guix")
(version (git-version "0.5.2" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.com/emacs-guix/emacs-guix")
+ ;; TODO: Use the official version when it has a new home
+ (url "https://github.com/jsoo1/guix.el")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
- "1qnr5sixmvrhr9rinrhfy7sy20mikjvvwbdixwkbx30qpcdwgwj1"))))
+ "1pqw7zbgxzwpig4xr0izc3z8h80c72i6bl5yi12br0d7aq6dbkvj"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
@@ -2817,7 +2818,8 @@ type, for example: packages, buffers, files, etc.")
("texinfo" ,texinfo)
("emacs" ,emacs-minimal)))
(inputs
- `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile"))
+ `(("guile"
+ ,@(assoc-ref (package-native-inputs guix) "guile"))
("guix" ,guix)))
(propagated-inputs
`(("geiser" ,emacs-geiser)
--
2.29.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* bug#45050: [PATCH] gnu: Update emacs-guix to temporary repository.
2020-12-11 20:27 ` John Soo
@ 2020-12-12 17:40 ` Ludovic Courtès
0 siblings, 0 replies; 8+ messages in thread
From: Ludovic Courtès @ 2020-12-12 17:40 UTC (permalink / raw)
To: John Soo; +Cc: 45050-done
Hi John,
John Soo <jsoo1@asu.edu> skribis:
> From 4fd99ba6fa6ef61e1077f1fcad6b5d56bbbbf69a Mon Sep 17 00:00:00 2001
> From: John Soo <jsoo1@asu.edu>
> Date: Thu, 12 Nov 2020 23:04:27 -0800
> Subject: [PATCH] gnu: Update emacs-guix.
>
> * gnu/packages/emacs-xyz.scm (emacs-guix): Update it, [inputs] Use guile for
> guix.
> * Fixes https://bugs.gnu.org/44062
I tweaked the commit log according to our conventions and applied it.
Great to see these fixes land, thanks!
BTW, I think it would be nice to preserve ChangeLog-style commit logs in
Emacs-Guix too, as has been done until now.
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-12-12 19:39 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-05 5:21 [bug#45050] [PATCH] gnu: Update emacs-guix to temporary repository John Soo
2020-12-05 5:24 ` [bug#45050] Oops! John Soo
2020-12-07 16:01 ` [bug#45050] [PATCH] gnu: Update emacs-guix to temporary repository zimoun
2020-12-07 16:15 ` John Soo
2020-12-07 16:55 ` zimoun
2020-12-11 17:47 ` Ludovic Courtès
2020-12-11 20:27 ` John Soo
2020-12-12 17:40 ` bug#45050: " Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.