[bug#50559] [PATCH 0/2] Add home modules to (guix self)

[bug#50559] [PATCH 0/2] Add home modules to (guix self)

[Andrew Tropin]

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


I studied (guix self) source code very briefly, so I hope I did changes
correctly.  Let me know, please, if something is wrong here.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-home-services-shepherd-Add-missing-exports.patch --]
[-- Type: text/x-patch, Size: 748 bytes --]

From 437a3d8e898b428d8b2347fc73f8611f342fec77 Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
Date: Fri, 10 Sep 2021 10:41:36 +0300
Subject: [PATCH 1/2] home-services: shepherd: Add missing exports.

* gnu/home-services/shepherd.scm: Add missing exports.
---
 gnu/home-services/shepherd.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/home-services/shepherd.scm b/gnu/home-services/shepherd.scm
index b9fd3c367b..120cfde1a1 100644
--- a/gnu/home-services/shepherd.scm
+++ b/gnu/home-services/shepherd.scm
@@ -27,6 +27,8 @@
 
   #:use-module (srfi srfi-1)
 
+  #:export (home-shepherd-service-type
+            home-shepherd-configuration)
   #:re-export (shepherd-service
                shepherd-action))
 
-- 
2.33.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-guix-self-Add-home-modules.patch --]
[-- Type: text/x-patch, Size: 1919 bytes --]

From ce36535761b0189043256ea17b79a8672be96fac Mon Sep 17 00:00:00 2001
From: Andrew Tropin <andrew@trop.in>
Date: Fri, 10 Sep 2021 12:53:02 +0300
Subject: [PATCH 2/2] guix: self: Add *home-modules*.

* guix/self.scm(*home-modules*): New variable.
---
 guix/self.scm | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/guix/self.scm b/guix/self.scm
index 79d93357a2..5922ea6aa1 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -958,13 +958,23 @@ itself."
                  #:guile-for-build
                  guile-for-build))
 
+  (define *home-modules*
+    (scheme-node "guix-home"
+                 `((gnu home)
+                   (gnu home-services)
+                   ,@(scheme-modules* source "gnu/home-services"))
+                 (list *core-package-modules* *package-modules*
+                       *extra-modules* *core-modules* *system-modules*)
+                 #:extensions dependencies
+                 #:guile-for-build guile-for-build))
+
   (define *cli-modules*
     (scheme-node "guix-cli"
                  (append (scheme-modules* source "/guix/scripts")
                          `((gnu ci)))
                  (list *core-modules* *extra-modules*
                        *core-package-modules* *package-modules*
-                       *system-modules*)
+                       *system-modules* *home-modules*)
                  #:extensions dependencies
                  #:guile-for-build guile-for-build))
 
@@ -1012,6 +1022,7 @@ itself."
                                        *cli-modules*
                                        *system-test-modules*
                                        *system-modules*
+                                       *home-modules*
                                        *package-modules*
                                        *core-package-modules*
                                        *extra-modules*
-- 
2.33.0


[-- Attachment #1.4: Type: text/plain, Size: 257 bytes --]


Andrew Tropin (2):
  home-services: shepherd: Add missing exports.
  guix: self: Add *home-modules*.

 gnu/home-services/shepherd.scm |  2 ++
 guix/self.scm                  | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

-- 
2.33.0


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

bug#50559: [PATCH 0/2] Add home modules to (guix self)

[Oleg Pykhalov]

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

Pushed to wip-guix-home.

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