Merging wip-guix-home to master

Done

Details

5 participants

Andrew Tropin
Katherine Cox-Buday
Oleg Pykhalov
Ludovic Courtès
zimoun

Owner: unassigned

Submitted by: Andrew Tropin

Severity: normal

Andrew Tropin wrote on 23 Sep 2021 11:53

Recipients:(address . guix-devel@gnu.org)

Message-ID:87sfxvehyf.fsf@trop.in

The core part of Guix Home project has been moved from rde

repository[fn:1] to wip-guix-home branch of guix repository.

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.

My guix describe looks like:

Toggle snippet (12 lines)

Generation 114 Sep 17 2021 13:33:55 (current)

rde 31f8003

repository URL: https://git.sr.ht/~abcdw/rde

branch: without-guix-home

commit: 31f800353a781cef25fc80c05ad824a068a049c8

guix a2324d8

repository URL: https://git.savannah.gnu.org/git/guix.git

branch: wip-guix-home

commit: a2324d8b56eabf8117bca220a507cc791edffd2e

There is a discussion[fn:2] on moving home services to (gnu services

...) modules, which is likely to happen, but it's possible to do the

migration relatively painless by re-exporting necessary symbols in

(gnu home-services ...) at first and removing them completely later.

Another important part of the work related to Guix Home project is

covering related modules and cli with tests, but it can be done in

parallel and is not a blocker for merging.

* Footnotes

[fn:1] https://git.sr.ht/~abcdw/rde

[fn:2] https://lists.gnu.org/archive/html/guix-devel/2021-09/msg00169.html

Oleg Pykhalov wrote on 23 Sep 2021 16:36

Recipients:(name . Andrew Tropin)(address . andrew@trop.in)(address . 50753@debbugs.gnu.org)

Message-ID:875yurnyul.fsf@gmail.com

Hi Andrew,

Andrew Tropin <andrew@trop.in> writes:

Toggle quote (4 lines)

> 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.

Katherine Cox-Buday wrote on 23 Sep 2021 17:27

Recipients:(name . Andrew Tropin)(address . andrew@trop.in)

Message-ID:87czozxqfk.fsf@gmail.com

Andrew Tropin <andrew@trop.in> writes:

Toggle quote (7 lines)

> The core part of Guix Home project has been moved from rde

> repository[fn:1] to wip-guix-home branch of guix repository.

> 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 just want to thank you for the work. I don't think I'll use this everywhere, but it is definitely going to be helpful in some environments. Thank you!

Katherine

Ludovic Courtès wrote on 23 Sep 2021 22:45

Recipients:(name . Andrew Tropin)(address . andrew@trop.in)

Message-ID:87h7eb81hi.fsf@gnu.org

Hi,

Andrew Tropin <andrew@trop.in> skribis:

Toggle quote (4 lines)

> 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.

Yay! I’d like to take another look (I know I’ve been terribly MIA,

apologies!), and I hope other folks familiar with Guix System can

comment as well.

Toggle quote (5 lines)

> There is a discussion[fn:2] on moving home services to (gnu services

> ...) modules, which is likely to happen, but it's possible to do the

> migration relatively painless by re-exporting necessary symbols in

> (gnu home-services ...) at first and removing them completely later.

I know it can be annoying to existing Guix Home users, but I’d prefer

not to carry pre-merge baggage; that is, we’d just rename and not

provide those modules under their former names at all.

Toggle quote (4 lines)

> Another important part of the work related to Guix Home project is

> covering related modules and cli with tests, but it can be done in

> parallel and is not a blocker for merging.

Do you have ideas of a possible testing strategy?

We should be able to test at least the CLI, either arranging to avoid

large builds (as in tests/guix-build.sh) or talking to the “real”

guix-daemon (as in tests/guix-pack-relocatable.sh) if we’re going to

need packages.

It’d be great to have this part ready soonish.

The way I see it, in 1.4 (2.0?), we’d mark Guix Home as a “technology

preview” in the manual with a prominent note. That will allow us to get

feedback from new users and to fine-tune code correspondingly, and

that’ll make it clear to users that things are still subject to change.

Thoughts?

Thanks,

Ludo’.

Andrew Tropin wrote on 24 Sep 2021 09:10

Recipients:(name . Oleg Pykhalov)(address . go.wigust@gmail.com)(address . 50753@debbugs.gnu.org)

Message-ID:87ilyqqwja.fsf@trop.in

On 2021-09-23 17:36, Oleg Pykhalov wrote:

Toggle quote (14 lines)> 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:

From 30bf1ca91569fe6cb2c90f48a6240862950919dd Mon Sep 17 00:00:00 2001

* doc/guix.texi: Add a note about Guix Home status.

---

doc/guix.texi | 6 ++++++

1 file changed, 6 insertions(+)

Toggle diff (19 lines)diff --git a/doc/guix.texi b/doc/guix.texi
index 419d9429d6..0306df73a4 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -35262,6 +35262,12 @@ command (@pxref{Invoking guix home}).
 @c Maybe later, it will be possible to make home configuration a part of
 @c system configuration to make everything managed by guix system.
 
+@quotation Note
+The functionality described in this section is still under development
+and is subject to change.  Get in touch with us on
+@email{guix-devel@@gnu.org}!
+@end quotation
+
 The user's home environment usually consists of three basic parts:
 software, configuration, and state.  Software in mainstream distros are
 usually installed system-wide, but with GNU Guix most software packages
-- 
2.33.0

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(+)

Toggle diff (42 lines)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

Andrew Tropin wrote on 24 Sep 2021 09:12

Recipients:(name . Katherine Cox-Buday)(address . cox.katherine.e@gmail.com)

Message-ID:87fstuqweh.fsf@trop.in

On 2021-09-23 10:27, Katherine Cox-Buday wrote:

Toggle quote (11 lines)> Andrew Tropin <andrew@trop.in> writes:
>
>> The core part of Guix Home project has been moved from rde
>> repository[fn:1] to wip-guix-home branch of guix repository.
>>
>> 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 just want to thank you for the work. I don't think I'll use this everywhere, but it is definitely going to be helpful in some environments. Thank you!

My pleasure)

Andrew Tropin wrote on 24 Sep 2021 09:43

Recipients:(name . Ludovic Courtès)(address . ludo@gnu.org)

Message-ID:875yuqquyq.fsf@trop.in

On 2021-09-23 22:45, Ludovic Courtès wrote:

Toggle quote (12 lines)> Hi,
>
> Andrew Tropin <andrew@trop.in> skribis:
>
>> 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.
>
> Yay!  I’d like to take another look (I know I’ve been terribly MIA,
> apologies!), and I hope other folks familiar with Guix System can
> comment as well.

Sure, let's wait for reviews/comments until next Thursday.

Toggle quote (11 lines)>
>> There is a discussion[fn:2] on moving home services to (gnu services
>> ...)  modules, which is likely to happen, but it's possible to do the
>> migration relatively painless by re-exporting necessary symbols in
>> (gnu home-services ...) at first and removing them completely later.
>
> I know it can be annoying to existing Guix Home users, but I’d prefer
> not to carry pre-merge baggage; that is, we’d just rename and not
> provide those modules under their former names at all.
>

Yep, it is very likely that it will be annoying, but I think it's

doable. It should be a relatively simple migration for users.

Toggle quote (6 lines)

>> Another important part of the work related to Guix Home project is

>> covering related modules and cli with tests, but it can be done in

>> parallel and is not a blocker for merging.

> Do you have ideas of a possible testing strategy?

Yep, I think we can do the same thing to tests/guix-system.sh, check

that `guix home build` provides desired results on simple configurations

and `guix home search` shows correct results on different input strings.

Toggle quote (8 lines)

> We should be able to test at least the CLI, either arranging to avoid

> large builds (as in tests/guix-build.sh) or talking to the “real”

> guix-daemon (as in tests/guix-pack-relocatable.sh) if we’re going to

> need packages.

> It’d be great to have this part ready soonish.

I hope to work on it next week.

Toggle quote (6 lines)

> The way I see it, in 1.4 (2.0?), we’d mark Guix Home as a “technology

> preview” in the manual with a prominent note. That will allow us to get

> feedback from new users and to fine-tune code correspondingly, and

> that’ll make it clear to users that things are still subject to change.

Marked it as a subject to change in Home Configuration section of the

manual, patch in the reply to Oleg.

Toggle quote (5 lines)>
> Thoughts?
>
> Thanks,
> Ludo’.

Oleg Pykhalov wrote on 27 Sep 2021 16:38

Recipients:(name . Andrew Tropin)(address . andrew@trop.in)(address . 50753-done@debbugs.gnu.org)

Message-ID:87v92mdqy8.fsf@gmail.com

Andrew Tropin <andrew@trop.in> writes:

[…]

Toggle quote (16 lines)>> 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(+)

[…]

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

Closed

Andrew Tropin wrote on 28 Sep 2021 09:10

Recipients:(name . Oleg Pykhalov)(address . go.wigust@gmail.com)(address . 50753-done@debbugs.gnu.org)

Message-ID:87czotgoqe.fsf@trop.in

On 2021-09-27 17:38, Oleg Pykhalov wrote:

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

Closed

zimoun wrote on 28 Sep 2021 09:45

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

Recipients:(name . Andrew Tropin)(address . andrew@trop.in)

Message-ID:86lf3hcfdc.fsf@gmail.com

Hi Oleg,

On Tue, 28 Sep 2021 at 10:10, Andrew Tropin <andrew@trop.in> wrote:

Toggle quote (6 lines)

> 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.

Toggle quote (3 lines)

> 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 wrote on 28 Sep 2021 11:41

Recipients:(name . zimoun)(address . zimon.toutoune@gmail.com)

Message-ID:877df1ghpy.fsf@trop.in

On 2021-09-28 09:45, zimoun wrote:

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

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

Toggle quote (4 lines)

> Thanks again for the merge.

> And thanks Andrew for the integration work.

Sure ;)

Thank you everyone for help, reviews and ideas!

Toggle quote (7 lines)>
> Cheers,
> simon
>
>
> 1: <http://issues.guix.gnu.org/issue/50753#3>
> 2: <http://issues.guix.gnu.org/issue/50753#6>

Ludovic Courtès wrote on 28 Sep 2021 12:13

Re: bug#50753: Merging wip-guix-home to master

Recipients:(name . Oleg Pykhalov)(address . go.wigust@gmail.com)

Message-ID:87r1d9dn49.fsf_-_@gnu.org

Hi Oleg and all,

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

Toggle quote (8 lines)

> 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’.

Your comment

This issue is archived.

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

To respond to this issue using the mumi CLI, first switch to it

mumi current 50753

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

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date