Merging wip-guix-home to master

Merging wip-guix-home to master

[Andrew Tropin]

[-- Attachment #1: Type: text/plain, Size: 1411 bytes --]

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:
--8<---------------cut here---------------start------------->8---
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
--8<---------------cut here---------------end--------------->8---


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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

[Oleg Pykhalov]

[-- Attachment #1: Type: text/plain, Size: 417 bytes --]

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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]

Re: Merging wip-guix-home to master

[Katherine Cox-Buday]

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!

-- 
Katherine

Re: Merging wip-guix-home to master

[Ludovic Courtès]

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.

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

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

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

[Andrew Tropin]

[-- Attachment #1.1: Type: text/plain, Size: 517 bytes --]

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:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-doc-Add-a-note-about-Guix-Home-status.patch --]
[-- Type: text/x-patch, Size: 1095 bytes --]

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

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


[-- Attachment #1.3: 0002-news-Add-entry-about-Guix-Home.patch --]
[-- Type: text/x-patch, Size: 2160 bytes --]

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


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: Merging wip-guix-home to master

[Andrew Tropin]

[-- Attachment #1: Type: text/plain, Size: 600 bytes --]

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

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: Merging wip-guix-home to master

[Andrew Tropin]

[-- Attachment #1: Type: text/plain, Size: 2444 bytes --]

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

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

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

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

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

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

>
> Thoughts?
>
> Thanks,
> Ludo’.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

[Oleg Pykhalov]

[-- Attachment #1: Type: text/plain, Size: 988 bytes --]

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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 861 bytes --]

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

[Andrew Tropin]

[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]

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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

[zimoun]

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>

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

[Andrew Tropin]

[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]

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>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

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

[Ludovic Courtès]

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