diff mbox series

[bug#50753] Merging wip-guix-home to master

Message ID 87ilyqqwja.fsf@trop.in
State Accepted
Headers show
Series [bug#50753] Merging wip-guix-home to master | expand

Checks

Context Check Description
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue
cbaines/applying patch fail View Laminar job
cbaines/issue success View issue

Commit Message

Andrew Tropin Sept. 24, 2021, 7:10 a.m. UTC 
On 2021-09-23 17:36, Oleg Pykhalov wrote:

> Hi Andrew,
>
> Andrew Tropin <andrew@trop.in> writes:
>
>> I'm about a week on wip-guix-home branch completely and Guix Home works
>> fine.  There are no any major issues on rde-devel and guix-devel mailing
>> lists and it seems that branch is ready to be merged.
>
> I also used ‘guix home’ for some configurations, seems it's good enough.
>
> Would you like to write an entry to ‘etc/news.scm’?  ;-)
>
> Oleg.

Good idea, thank you)

Added:

Comments

Oleg Pykhalov Sept. 27, 2021, 2:38 p.m. UTC | #1 
Andrew Tropin <andrew@trop.in> writes:

[…]

>> Would you like to write an entry to ‘etc/news.scm’?  ;-)
>
> Good idea, thank you)
>
> Added:
>
> From 30bf1ca91569fe6cb2c90f48a6240862950919dd Mon Sep 17 00:00:00 2001
> From: Andrew Tropin <andrew@trop.in>
> Date: Fri, 24 Sep 2021 09:14:19 +0300
> Subject: [PATCH 1/2] doc: Add a note about Guix Home status.
>
> * doc/guix.texi: Add a note about Guix Home status.
> ---
>  doc/guix.texi | 6 ++++++
>  1 file changed, 6 insertions(+)

[…]

> From 4231a594f3b371c416b1de7bf0762dc54cf05816 Mon Sep 17 00:00:00 2001
> From: Andrew Tropin <andrew@trop.in>
> Date: Fri, 24 Sep 2021 10:06:48 +0300
> Subject: [PATCH 2/2] news: Add entry about Guix Home.
>
> * etc/news.scm: Add entry.
> ---
>  etc/news.scm | 29 +++++++++++++++++++++++++++++
>  1 file changed, 29 insertions(+)

[…]

Applied to wip-guix-home, merged wip-guix-home to master.  Whooho!

Marking the issue as done.

Thanks,
Oleg.
Andrew Tropin Sept. 28, 2021, 7:10 a.m. UTC | #2 
On 2021-09-27 17:38, Oleg Pykhalov wrote:

> Andrew Tropin <andrew@trop.in> writes:
>
> […]
>
>>> Would you like to write an entry to ‘etc/news.scm’?  ;-)
>>
>> Good idea, thank you)
>>
>> Added:
>>
>> From 30bf1ca91569fe6cb2c90f48a6240862950919dd Mon Sep 17 00:00:00 2001
>> From: Andrew Tropin <andrew@trop.in>
>> Date: Fri, 24 Sep 2021 09:14:19 +0300
>> Subject: [PATCH 1/2] doc: Add a note about Guix Home status.
>>
>> * doc/guix.texi: Add a note about Guix Home status.
>> ---
>>  doc/guix.texi | 6 ++++++
>>  1 file changed, 6 insertions(+)
>
> […]
>
>> From 4231a594f3b371c416b1de7bf0762dc54cf05816 Mon Sep 17 00:00:00 2001
>> From: Andrew Tropin <andrew@trop.in>
>> Date: Fri, 24 Sep 2021 10:06:48 +0300
>> Subject: [PATCH 2/2] news: Add entry about Guix Home.
>>
>> * etc/news.scm: Add entry.
>> ---
>>  etc/news.scm | 29 +++++++++++++++++++++++++++++
>>  1 file changed, 29 insertions(+)
>
> […]
>
> Applied to wip-guix-home, merged wip-guix-home to master.  Whooho!
>
> Marking the issue as done.
>
> Thanks,
> Oleg.

A little faster than I expected)  Thank you very much for all the
help with upstreaming Guix Home!

Need to finish a few more things before next Guix release, will send
them as separate patches against master.
Simon Tournier Sept. 28, 2021, 7:45 a.m. UTC | #3 
Hi Oleg,

On Tue, 28 Sep 2021 at 10:10, Andrew Tropin <andrew@trop.in> wrote:
> On 2021-09-27 17:38, Oleg Pykhalov wrote:

>> Applied to wip-guix-home, merged wip-guix-home to master.  Whooho!
>>
>> Marking the issue as done.

Thanks for all the work.  Merge is always hard and unrewardy task.


> A little faster than I expected)  Thank you very much for all the
> help with upstreaming Guix Home!

However, I agree the merge had been a bit faster than expected [1,2].
Maybe we could have prevented:

<http://issues.guix.gnu.org/issue/50856>

and probably other “polishing” issues.  Well at least, these issues are
now fully exposed. ;-)

Thanks again for the merge.
And thanks Andrew for the integration work.

Cheers,
simon


1: <http://issues.guix.gnu.org/issue/50753#3>
2: <http://issues.guix.gnu.org/issue/50753#6>
Andrew Tropin Sept. 28, 2021, 9:41 a.m. UTC | #4 
On 2021-09-28 09:45, zimoun wrote:

> Hi Oleg,
>
> On Tue, 28 Sep 2021 at 10:10, Andrew Tropin <andrew@trop.in> wrote:
>> On 2021-09-27 17:38, Oleg Pykhalov wrote:
>
>>> Applied to wip-guix-home, merged wip-guix-home to master.  Whooho!
>>>
>>> Marking the issue as done.
>
> Thanks for all the work.  Merge is always hard and unrewardy task.

Yep, much appreciate and kudos to Oleg.

>
>
>> A little faster than I expected)  Thank you very much for all the
>> help with upstreaming Guix Home!
>
> However, I agree the merge had been a bit faster than expected [1,2].
> Maybe we could have prevented:
>
> <http://issues.guix.gnu.org/issue/50856>
>
> and probably other “polishing” issues.  Well at least, these issues are
> now fully exposed. ;-)

The fix is on the way)

>
> Thanks again for the merge.
> And thanks Andrew for the integration work.

Sure ;)
Thank you everyone for help, reviews and ideas! 

>
> Cheers,
> simon
>
>
> 1: <http://issues.guix.gnu.org/issue/50753#3>
> 2: <http://issues.guix.gnu.org/issue/50753#6>
Ludovic Courtès Sept. 28, 2021, 10:13 a.m. UTC | #5 
Hi Oleg and all,

zimoun <zimon.toutoune@gmail.com> skribis:

> However, I agree the merge had been a bit faster than expected [1,2].
> Maybe we could have prevented:
>
> <http://issues.guix.gnu.org/issue/50856>
>
> and probably other “polishing” issues.  Well at least, these issues are
> now fully exposed. ;-)

Yeah, I would have felt more relaxed if this had been less rushed, if
suggestions recently made on guix-devel had been discussed, and if
requests for extra review time had been heard.  It’s like hearing
there’s a party outside but you know you have to finish your homework
before you can join.

Now, even though my stress level spiked a bit given the pressure it puts
on us, I think this is exciting news and I’m grateful to Oleg has been
working with Andrew for the past month or so to make it happen!

Thanks,
Ludo’.
diff mbox series

Patch

From 4231a594f3b371c416b1de7bf0762dc54cf05816 Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
Date: Fri, 24 Sep 2021 10:06:48 +0300
Subject: [PATCH 2/2] news: Add entry about Guix Home.

* etc/news.scm: Add entry.
---
 etc/news.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/etc/news.scm b/etc/news.scm
index 88d23d71ed..68d04d99ab 100644
--- a/etc/news.scm
+++ b/etc/news.scm
@@ -22,6 +22,35 @@ 
 
 (channel-news
  (version 0)
+(entry (commit "a2324d8b56eabf8117bca220a507cc791edffd2e")
+        (title
+         (en "Guix Home is a part of GNU Guix")
+         (ru "Guix Home теперь поставляется в составе GNU Guix"))
+        (body
+         (en "Guix Home splitted out from rde project and now is a part of
+Guix proper.  The new @command{guix home} with its actions allows users to
+manage their packages and configurations (aka. dotfiles) in a declarative way,
+similar to how many people manage their system with @command{guix system}.
+
+Take a look at available actions and arguments:
+@example
+guix home --help
+@end example
+
+See @command{info \"(guix) Home Configuration\"} for more information.")
+         (ru "Guix Home отделился от проекта rde и теперь является частью
+Guix.  Новая команда @command{guix home} даёт возможность пользователям
+управлять их пакетами и конфигурациями (дотфайлами) для них в декларативном
+стиле, аналогично тому, как многие люди управляют своими системами с помощью
+@command{guix system}.
+
+Чтобы получить список доступных действий и аргументов:
+@example
+guix home --help
+@end example
+
+Смотрите @command{info \"(guix) Home Configuration\"} для получения более
+детальных сведений.")))
 
  (entry (commit "82daab42811a2e3c7684ebdf12af75ff0fa67b99")
         (title
-- 
2.33.0