From patchwork Mon Oct 4 23:13:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 33606 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A6C1527BBE3; Tue, 5 Oct 2021 00:15:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C5FDD27BBE1 for ; Tue, 5 Oct 2021 00:15:20 +0100 (BST) Received: from localhost ([::1]:35706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXXB0-0005EE-5r for patchwork@mira.cbaines.net; Mon, 04 Oct 2021 19:15:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXXAk-0005CY-O0 for guix-patches@gnu.org; Mon, 04 Oct 2021 19:15:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55290) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mXXAk-0008Ni-GU for guix-patches@gnu.org; Mon, 04 Oct 2021 19:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mXXAk-0006eY-Bn for guix-patches@gnu.org; Mon, 04 Oct 2021 19:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50967] [PATCH 1/3] gnu: Move (gnu home-services) to (gnu home services). Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Oct 2021 23:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50967 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 50967@debbugs.gnu.org Cc: Oleg Pykhalov , Ludovic =?utf-8?q?Court=C3=A8s?= , Xinglu Chen , Andrew Tropin Received: via spool by 50967-submit@debbugs.gnu.org id=B50967.163338924925458 (code B ref 50967); Mon, 04 Oct 2021 23:15:02 +0000 Received: (at 50967) by debbugs.gnu.org; 4 Oct 2021 23:14:09 +0000 Received: from localhost ([127.0.0.1]:38595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mXX9s-0006cQ-MH for submit@debbugs.gnu.org; Mon, 04 Oct 2021 19:14:09 -0400 Received: from mail-lf1-f41.google.com ([209.85.167.41]:41981) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mXX9j-0006bP-Lt for 50967@debbugs.gnu.org; Mon, 04 Oct 2021 19:14:03 -0400 Received: by mail-lf1-f41.google.com with SMTP id j5so73223483lfg.8 for <50967@debbugs.gnu.org>; Mon, 04 Oct 2021 16:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O/BmaZH8GKCmbqbeqjoewwHkpoMs5jYBTbcJLJhjhhY=; b=OEPy4QzhaQH4mIVW0gMEAXAbk2pMhjB1v4yX+ukiXyk8doF15KtATsmwgAEC03xVxC tB0c4RGdzo5ISS2YRdiyKNNCzrR5nvL6X/nRpOlA/aD2wKM9jxLK1ii7Fr5UCkwpFHB2 E6SyqJcMw+szN72T6+lZTSRynQwjL7E+rRwOipvAWOon/oFmT29nABkxSXyIxOr+FCRp dtu/dbXHMrthX4ZpY4bZuf3lymWbUSgl7QQv/BoxJrVZYG8uUvE0OFhtU5nEUrZiYAZy UC/84LPXOqAzBZMzLKUBq/45zN0RtqxE3f/hFx2FxIvoU2V86Ef+ab3AVsDxOOJHcP+s WVgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O/BmaZH8GKCmbqbeqjoewwHkpoMs5jYBTbcJLJhjhhY=; b=BL0ZFYbQs5yDYujpv37OmoKaBTNW5nH1H2/toWO3RTfDOWVinz5MMJLDL7bhxLauoL Jmt6cYDIzoBvnGFKHaRJUx3qXK43gPVHG1rNtNT2E1LG9IYz91sW42R+eSW56REepNsB oqCA/e48xVstwRcYuSKFWDMwVrk5zwSgtt+yROvKO3a9D+2Tn1EUUPUZb5m9jPXcLAtl S0a6eUcZNAuD2Wt3D9vVlAP4tUHvh/MNOZr8R2C1y6SpkJEjiS8jxjKrwDKZXWTS3zZd QvAh0UMpTChhVPFQErAKIILTJWgyC3tltBRyHYcruGBafm1bfJHQtcIWe99g4BIjfVQp K2xQ== X-Gm-Message-State: AOAM530wZRb6pX9Uv3rI8Okk9ZsyOOn9sb91l1MlIq54BMOOiSl9Uq1A y/3gXCKMjuv8XZQpRk2QeeGt2b2cOjs= X-Google-Smtp-Source: ABdhPJyOb3i2py7wwdISHmBEWQs/RL3Wtb235ySsTA2Tz1Przz9PFjnbQWxF6FwAB6gxGr9L30krWw== X-Received: by 2002:a2e:9cd:: with SMTP id 196mr18806899ljj.434.1633389232972; Mon, 04 Oct 2021 16:13:52 -0700 (PDT) Received: from localhost.localdomain ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id h4sm1736542lft.184.2021.10.04.16.13.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Oct 2021 16:13:52 -0700 (PDT) From: Oleg Pykhalov Date: Tue, 5 Oct 2021 02:13:29 +0300 Message-Id: <20211004231331.5269-1-go.wigust@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <87h7dwq4cb.fsf_-_@gnu.org> References: <87h7dwq4cb.fsf_-_@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/home-services/configuration.scm: Move the content ... * gnu/home/services/configuration.scm: ... here. * gnu/local.mk (GNU_SYSTEM_MODULES): Same. * gnu/home-services/shells.scm: Replace (gnu home-services configuration) with (gnu home services configuration). * gnu/home-services/xdg.scm: Same. * gnu/home-services/symlink-manager.scm: Rename to gnu/home/services/symlink-manager.scm. * gnu/local.mk: Same. * gnu/home.scm: Replace (gnu home-services symlink-manager) with (gnu home services symlink-manager). * gnu/home-services/utils.scm: Rename to gnu/home/services/utils.scm. * gnu/local.mk: Same. * gnu/home-services/shells.scm: Replace (gnu home-services utils) with (gnu home services utils). * gnu/home-services/xdg.scm: Same. * gnu/home-services/fontutils.scm: Rename to gnu/services/fontutils.scm. * gnu/local.mk: Same. * gnu/home.scm: Replace (gnu home-services fontutils) with (gnu services fontutils). * gnu/home-services/shells.scm: Rename to gnu/home/services/shells.scm. * gnu/local.mk: Same. * gnu/home.scm: Replace (gnu home-services shells) with (gnu home services shells). * doc/he-config-bare-bones.scm: Same. * gnu/home-services/xdg.scm: Rename to gnu/home/services/xdg.scm. * gnu/local.mk: Same. * gnu/home.scm: Replace (gnu home-services xdg) with (gnu home services xdg). * gnu/home-services/shepherd.scm: Move to gnu/home/services/shepherd.scm. * gnu/local.mk: Same. * gnu/home-services/mcron.scm: Replace (gnu home-services shepherd) with (gnu home services shepherd). * tests/guix-home.sh: Same. * gnu/home-services/mcron.scm: Move to gnu/home/services/mcron.scm. * gnu/local.mk: Same. * doc/guix.texi: Replace (gnu home-services mcron) with (gnu home services mcron). * guix/scripts/home/import.scm: Replace (gnu home-services bash) with (gnu home services bash). * doc/guix.texi: Replace (gnu home-services) with (gnu home services). * gnu/home-services.scm (%service-type-path): Search home services in "gnu/services". * gnu/home-services.scm: Update documentation string. --- doc/guix.texi | 8 ++++---- doc/he-config-bare-bones.scm | 2 +- gnu/home-services.scm | 4 ++-- gnu/home.scm | 8 ++++---- .../services}/configuration.scm | 2 +- .../services}/fontutils.scm | 2 +- gnu/{home-services => home/services}/mcron.scm | 4 ++-- gnu/{home-services => home/services}/shells.scm | 6 +++--- .../services}/shepherd.scm | 2 +- .../services}/symlink-manager.scm | 2 +- gnu/{home-services => home/services}/utils.scm | 2 +- gnu/{home-services => home/services}/xdg.scm | 6 +++--- gnu/local.mk | 16 ++++++++-------- guix/scripts/home/import.scm | 2 +- 14 files changed, 33 insertions(+), 33 deletions(-) rename gnu/{home-services => home/services}/configuration.scm (98%) rename gnu/{home-services => home/services}/fontutils.scm (98%) rename gnu/{home-services => home/services}/mcron.scm (98%) rename gnu/{home-services => home/services}/shells.scm (99%) rename gnu/{home-services => home/services}/shepherd.scm (99%) rename gnu/{home-services => home/services}/symlink-manager.scm (99%) rename gnu/{home-services => home/services}/utils.scm (98%) rename gnu/{home-services => home/services}/xdg.scm (99%) diff --git a/doc/guix.texi b/doc/guix.texi index a72a726b54..d641935e0f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -35555,9 +35555,9 @@ services)}. @node Essential Home Services @subsection Essential Home Services -There are a few essential services defined in @code{(gnu -home-services)}, they are mostly for internal use and are required to -build a home environment, but some of them will be useful for the end +There are a few essential home services defined in +@code{(gnu services)}, they are mostly for internal use and are required +to build a home environment, but some of them will be useful for the end user. @cindex environment variables @@ -35810,7 +35810,7 @@ for example). @cindex mcron @cindex scheduling jobs -The @code{(gnu home-services mcron)} module provides an interface to +The @code{(gnu home services mcron)} module provides an interface to GNU@tie{}mcron, a daemon to run jobs at scheduled times (@pxref{Top,,, mcron, GNU@tie{}mcron}). The information about system's mcron is applicable here (@pxref{Scheduled Job Execution}), the only difference diff --git a/doc/he-config-bare-bones.scm b/doc/he-config-bare-bones.scm index 01be46a7b0..1faf75b871 100644 --- a/doc/he-config-bare-bones.scm +++ b/doc/he-config-bare-bones.scm @@ -1,6 +1,6 @@ (use-modules (gnu home) (gnu home-services) - (gnu home-services shells) + (gnu home services shells) (gnu services) (gnu packages admin) (guix gexp)) diff --git a/gnu/home-services.scm b/gnu/home-services.scm index 9f1e986616..a244a15511 100644 --- a/gnu/home-services.scm +++ b/gnu/home-services.scm @@ -512,10 +512,10 @@ environment, and its configuration file, when available."))) (define %service-type-path ;; Search path for service types. - (make-parameter `((,%guix-home-root-directory . "gnu/home-services")))) + (make-parameter `((,%guix-home-root-directory . "gnu/home/services")))) (define (all-home-service-modules) - "Return the default set of home-service modules." + "Return the default set of `home service' modules." (cons (resolve-interface '(gnu home-services)) (all-modules (%service-type-path) #:warn warn-about-load-error))) diff --git a/gnu/home.scm b/gnu/home.scm index f4c9359e25..5ac382dc5a 100644 --- a/gnu/home.scm +++ b/gnu/home.scm @@ -18,10 +18,10 @@ (define-module (gnu home) #:use-module (gnu home-services) - #:use-module (gnu home-services symlink-manager) - #:use-module (gnu home-services shells) - #:use-module (gnu home-services xdg) - #:use-module (gnu home-services fontutils) + #:use-module (gnu home services symlink-manager) + #:use-module (gnu home services shells) + #:use-module (gnu home services xdg) + #:use-module (gnu home services fontutils) #:use-module (gnu services) #:use-module (guix records) #:use-module (guix diagnostics) diff --git a/gnu/home-services/configuration.scm b/gnu/home/services/configuration.scm similarity index 98% rename from gnu/home-services/configuration.scm rename to gnu/home/services/configuration.scm index e8f4bc77ec..5e7743e7d6 100644 --- a/gnu/home-services/configuration.scm +++ b/gnu/home/services/configuration.scm @@ -17,7 +17,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(define-module (gnu home-services configuration) +(define-module (gnu home services configuration) #:use-module (gnu services configuration) #:use-module (guix gexp) #:use-module (srfi srfi-1) diff --git a/gnu/home-services/fontutils.scm b/gnu/home/services/fontutils.scm similarity index 98% rename from gnu/home-services/fontutils.scm rename to gnu/home/services/fontutils.scm index 28bfc3d3f7..72a84fdecd 100644 --- a/gnu/home-services/fontutils.scm +++ b/gnu/home/services/fontutils.scm @@ -17,7 +17,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(define-module (gnu home-services fontutils) +(define-module (gnu home services fontutils) #:use-module (gnu home-services) #:use-module (gnu packages fontutils) #:use-module (guix gexp) diff --git a/gnu/home-services/mcron.scm b/gnu/home/services/mcron.scm similarity index 98% rename from gnu/home-services/mcron.scm rename to gnu/home/services/mcron.scm index fdfde179a5..cc6faac47f 100644 --- a/gnu/home-services/mcron.scm +++ b/gnu/home/services/mcron.scm @@ -17,11 +17,11 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(define-module (gnu home-services mcron) +(define-module (gnu home services mcron) #:use-module (gnu packages guile-xyz) #:use-module (gnu home-services) - #:use-module (gnu home-services shepherd) #:use-module (gnu services shepherd) + #:use-module (gnu home services shepherd) #:use-module (guix records) #:use-module (guix gexp) #:use-module (srfi srfi-1) diff --git a/gnu/home-services/shells.scm b/gnu/home/services/shells.scm similarity index 99% rename from gnu/home-services/shells.scm rename to gnu/home/services/shells.scm index ecb02098f7..2308371dd0 100644 --- a/gnu/home-services/shells.scm +++ b/gnu/home/services/shells.scm @@ -17,10 +17,10 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(define-module (gnu home-services shells) +(define-module (gnu home services shells) #:use-module (gnu services configuration) - #:use-module (gnu home-services configuration) - #:use-module (gnu home-services utils) + #:use-module (gnu home services configuration) + #:use-module (gnu home services utils) #:use-module (gnu home-services) #:use-module (gnu packages shells) #:use-module (gnu packages bash) diff --git a/gnu/home-services/shepherd.scm b/gnu/home/services/shepherd.scm similarity index 99% rename from gnu/home-services/shepherd.scm rename to gnu/home/services/shepherd.scm index 120cfde1a1..1a3e849bb2 100644 --- a/gnu/home-services/shepherd.scm +++ b/gnu/home/services/shepherd.scm @@ -17,7 +17,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(define-module (gnu home-services shepherd) +(define-module (gnu home services shepherd) #:use-module (gnu home-services) #:use-module (gnu packages admin) #:use-module (gnu services shepherd) diff --git a/gnu/home-services/symlink-manager.scm b/gnu/home/services/symlink-manager.scm similarity index 99% rename from gnu/home-services/symlink-manager.scm rename to gnu/home/services/symlink-manager.scm index 11f5d503d4..d53e8f5046 100644 --- a/gnu/home-services/symlink-manager.scm +++ b/gnu/home/services/symlink-manager.scm @@ -17,7 +17,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(define-module (gnu home-services symlink-manager) +(define-module (gnu home services symlink-manager) #:use-module (gnu home-services) #:use-module (guix gexp) diff --git a/gnu/home-services/utils.scm b/gnu/home/services/utils.scm similarity index 98% rename from gnu/home-services/utils.scm rename to gnu/home/services/utils.scm index f13133a7ae..cea75ee896 100644 --- a/gnu/home-services/utils.scm +++ b/gnu/home/services/utils.scm @@ -17,7 +17,7 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(define-module (gnu home-services utils) +(define-module (gnu home services utils) #:use-module (ice-9 string-fun) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) diff --git a/gnu/home-services/xdg.scm b/gnu/home/services/xdg.scm similarity index 99% rename from gnu/home-services/xdg.scm rename to gnu/home/services/xdg.scm index 94275f3b65..4aed9a5803 100644 --- a/gnu/home-services/xdg.scm +++ b/gnu/home/services/xdg.scm @@ -17,12 +17,12 @@ ;;; You should have received a copy of the GNU General Public License ;;; along with GNU Guix. If not, see . -(define-module (gnu home-services xdg) +(define-module (gnu home services xdg) #:use-module (gnu services configuration) - #:use-module (gnu home-services configuration) + #:use-module (gnu home services configuration) #:use-module (gnu home-services) #:use-module (gnu packages freedesktop) - #:use-module (gnu home-services utils) + #:use-module (gnu home services utils) #:use-module (guix gexp) #:use-module (guix records) #:use-module (guix i18n) diff --git a/gnu/local.mk b/gnu/local.mk index d415b892e9..5e8b769ce9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -75,14 +75,14 @@ GNU_SYSTEM_MODULES = \ %D%/ci.scm \ %D%/home.scm \ %D%/home-services.scm \ - %D%/home-services/symlink-manager.scm \ - %D%/home-services/fontutils.scm \ - %D%/home-services/configuration.scm \ - %D%/home-services/shells.scm \ - %D%/home-services/shepherd.scm \ - %D%/home-services/mcron.scm \ - %D%/home-services/utils.scm \ - %D%/home-services/xdg.scm \ + %D%/home/services/symlink-manager.scm \ + %D%/home/services/fontutils.scm \ + %D%/home/services/configuration.scm \ + %D%/home/services/shells.scm \ + %D%/home/services/shepherd.scm \ + %D%/home/services/mcron.scm \ + %D%/home/services/utils.scm \ + %D%/home/services/xdg.scm \ %D%/image.scm \ %D%/packages.scm \ %D%/packages/abduco.scm \ diff --git a/guix/scripts/home/import.scm b/guix/scripts/home/import.scm index 79fb23a2fd..c977ec3861 100644 --- a/guix/scripts/home/import.scm +++ b/guix/scripts/home/import.scm @@ -41,7 +41,7 @@ (let ((rc (string-append (getenv "HOME") "/.bashrc")) (profile (string-append (getenv "HOME") "/.bash_profile")) (logout (string-append (getenv "HOME") "/.bash_logout"))) - `((gnu home-services bash) + `((gnu home services bash) (service home-bash-service-type (home-bash-configuration ,@(if (file-exists? rc)