Move (gnu home-services) to (gnu home services).

* gnu/home-services.scm (%guix-home-root-directory): Replace gnu/home-services.scm with "gnu/home/services.scm". Rename to gnu/home/services.scm. * gnu/local.mk (GNU_SYSTEM_MODULES): Rename gnu/home-services.scm to gnu/home/services.scm. * doc/he-config-bare-bones.scm: Replace (gnu home-services) with (gnu home services). * gnu/home.scm: Same. * gnu/home/services/fontutils.scm: Same. * gnu/home/services/mcron.scm: Same. * gnu/home/services/shells.scm: Same. * gnu/home/services/shepherd.scm: Same. * gnu/home/services/symlink-manager.scm: Same. * gnu/home/services/xdg.scm: Same. * guix/scripts/home.scm: Same. * guix/self.scm: Same.
2021-10-09 16:51:25 +03:00 · 2021-10-09 16:51:25 +03:00 · 0e8d2df0f1
commit 0e8d2df0f1
parent 2600002b9a
12 changed files with 14 additions and 14 deletions
--- a/doc/he-config-bare-bones.scm
+++ b/doc/he-config-bare-bones.scm
@ -1,5 +1,5 @@
 (use-modules (gnu home)
-             (gnu home-services)
+             (gnu home services)
             (gnu home services shells)
             (gnu services)
             (gnu packages admin)
--- a/gnu/home.scm
+++ b/gnu/home.scm
@ -17,7 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu home)
-  #:use-module (gnu home-services)
+  #:use-module (gnu home services)
  #:use-module (gnu home services symlink-manager)
  #:use-module (gnu home services shells)
  #:use-module (gnu home services xdg)
--- a/gnu/home/services.scm
+++ b/gnu/home/services.scm
@ -17,7 +17,7 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

-(define-module (gnu home-services)
+(define-module (gnu home services)
  #:use-module (gnu services)
  #:use-module (guix channels)
  #:use-module (guix monads)
@ -508,7 +508,7 @@ environment, and its configuration file, when available.")))

 (define %guix-home-root-directory
  ;; Absolute file name of the module hierarchy.
-  (parent-directory (dirname (search-path %load-path "gnu/home-services.scm"))))
+  (parent-directory (dirname (search-path %load-path "gnu/home/services.scm"))))

 (define %service-type-path
  ;; Search path for service types.
@ -516,7 +516,7 @@ environment, and its configuration file, when available.")))

 (define (all-home-service-modules)
  "Return the default set of `home service' modules."
-  (cons (resolve-interface '(gnu home-services))
+  (cons (resolve-interface '(gnu home services))
        (all-modules (%service-type-path)
                     #:warn warn-about-load-error)))

--- a/gnu/home/services/fontutils.scm
+++ b/gnu/home/services/fontutils.scm
@ -18,7 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu home services fontutils)
-  #:use-module (gnu home-services)
+  #:use-module (gnu home services)
  #:use-module (gnu packages fontutils)
  #:use-module (guix gexp)

--- a/gnu/home/services/mcron.scm
+++ b/gnu/home/services/mcron.scm
@ -19,7 +19,7 @@

 (define-module (gnu home services mcron)
  #:use-module (gnu packages guile-xyz)
-  #:use-module (gnu home-services)
+  #:use-module (gnu home services)
  #:use-module (gnu services shepherd)
  #:use-module (gnu home services shepherd)
  #:use-module (guix records)
--- a/gnu/home/services/shells.scm
+++ b/gnu/home/services/shells.scm
@ -21,7 +21,7 @@
  #:use-module (gnu services configuration)
  #:use-module (gnu home services configuration)
  #:use-module (gnu home services utils)
-  #:use-module (gnu home-services)
+  #:use-module (gnu home services)
  #:use-module (gnu packages shells)
  #:use-module (gnu packages bash)
  #:use-module (guix gexp)
--- a/gnu/home/services/shepherd.scm
+++ b/gnu/home/services/shepherd.scm
@ -18,7 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu home services shepherd)
-  #:use-module (gnu home-services)
+  #:use-module (gnu home services)
  #:use-module (gnu packages admin)
  #:use-module (gnu services shepherd)
  #:use-module (guix sets)
--- a/gnu/home/services/symlink-manager.scm
+++ b/gnu/home/services/symlink-manager.scm
@ -18,7 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu home services symlink-manager)
-  #:use-module (gnu home-services)
+  #:use-module (gnu home services)
  #:use-module (guix gexp)

  #:export (home-symlink-manager-service-type))
--- a/gnu/home/services/xdg.scm
+++ b/gnu/home/services/xdg.scm
@ -20,7 +20,7 @@
 (define-module (gnu home services xdg)
  #:use-module (gnu services configuration)
  #:use-module (gnu home services configuration)
-  #:use-module (gnu home-services)
+  #:use-module (gnu home services)
  #:use-module (gnu packages freedesktop)
  #:use-module (gnu home services utils)
  #:use-module (guix gexp)
--- a/gnu/local.mk
+++ b/gnu/local.mk
@ -74,7 +74,7 @@ GNU_SYSTEM_MODULES =				\
  %D%/bootloader/depthcharge.scm                \
  %D%/ci.scm					\
  %D%/home.scm					\
-  %D%/home-services.scm			\
+  %D%/home/services.scm			\
  %D%/home/services/symlink-manager.scm		\
  %D%/home/services/fontutils.scm		\
  %D%/home/services/configuration.scm		\
--- a/guix/scripts/home.scm
+++ b/guix/scripts/home.scm
@ -23,7 +23,7 @@
  #:use-module ((gnu services) #:hide (delete))
  #:use-module (gnu packages)
  #:use-module (gnu home)
-  #:use-module (gnu home-services)
+  #:use-module (gnu home services)
  #:use-module (guix channels)
  #:use-module (guix derivations)
  #:use-module (guix ui)
--- a/guix/self.scm
+++ b/guix/self.scm
@ -961,7 +961,7 @@ itself."
  (define *home-modules*
    (scheme-node "guix-home"
                 `((gnu home)
-                   (gnu home-services)
+                   (gnu home services)
                   ,@(scheme-modules* source "gnu/home/services"))
                 (list *core-package-modules* *package-modules*
                       *extra-modules* *core-modules* *system-modules*)