From patchwork Sat Oct 2 16:38:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 33572 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 853BF27BBE4; Sat, 2 Oct 2021 17:41:00 +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 11F5527BBE1 for ; Sat, 2 Oct 2021 17:41:00 +0100 (BST) Received: from localhost ([::1]:46922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWi4J-0002hC-61 for patchwork@mira.cbaines.net; Sat, 02 Oct 2021 12:40:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWi3R-0002Aq-6y for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWi3Q-0002z6-TH for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWi3Q-0008KK-RX for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50967] [PATCH 08/14] gnu: home-services: Move shepherd to (gnu home services). Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Oct 2021 16:40:04 +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: patch To: 50967@debbugs.gnu.org Cc: Oleg Pykhalov Received: via spool by 50967-submit@debbugs.gnu.org id=B50967.163319274931840 (code B ref 50967); Sat, 02 Oct 2021 16:40:04 +0000 Received: (at 50967) by debbugs.gnu.org; 2 Oct 2021 16:39:09 +0000 Received: from localhost ([127.0.0.1]:60430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2X-0008HO-2G for submit@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:09 -0400 Received: from mail-lf1-f41.google.com ([209.85.167.41]:36536) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2N-0008Es-S1 for 50967@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:00 -0400 Received: by mail-lf1-f41.google.com with SMTP id b20so52013112lfv.3 for <50967@debbugs.gnu.org>; Sat, 02 Oct 2021 09:38: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=8qCQZYbFrS8WfHN1v7+1jwPIiphPfeWEOyNXD5r4wBw=; b=NOnCqt4mZP7q8C1K6/4vG9pC0OjVZQD5wTFtATqmaMmRM4TZBiF2Drb7j08lF+SSSK jbxGhCkApa35XLVuFkja3PzIlh6w+ywt+Eu2QWMtOm/tbCowa9cGYNbYmY5X+uVM13x7 9DD2utjVt32gZZS1w4Eiw6f1V0MZek3df2cOhwW/+hWf47vVGIwIhADI9eDDz4m9Ujfi 3obVWDxl2SMCi2IbMPZo8J6hZXIL9eSQ19A0oEfAKER20KdHP/24jDBZf0urg6UvLhmA hxHhjtU4DCt2Zo8ZAehCWZvyhsTBlfcyU+oWkjxKJWV/eTwpwh8oYn89OHfs+jQfZWgi AeTA== 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=8qCQZYbFrS8WfHN1v7+1jwPIiphPfeWEOyNXD5r4wBw=; b=smyqdOGploTb8/T6EP1+p5ZYqlOnVsM7MU1HV2SgTrP4FlfMlDalRJgDrrRFT4X04M p7SZwdnz+R0j+1KNRcu4/JeEazyhbfeP4zdYnM1DXtu9k5YCmEKo02/YB8bnmD6HYUjX sP1Qu59jGElUwc/4qHfnd6hw85FEzclHuRBZpko5y7WnoEwRv7fG6s/xl5NuVX561NAo eWfxIYlzfOMgaWBfycTycwB/1uP5r540kdlKfOsCXLezkwUBRupzT2fHf3TG6B6nDY/o pPI46NPpPNI7imOzRYGxsYVcpkPEg+cz59S+BKwOWexytMLXM7mZtYqPlcUu0huJMvO/ +CHQ== X-Gm-Message-State: AOAM533LXwD7/EMFNthWZsm7QLhS9pM7coxcxsbCzbe3gtzekpOuassc Ki9zUVH300iB3UOFhxxwTXvZLOJ+FG8= X-Google-Smtp-Source: ABdhPJymYkAdWiXCzPP2njR2aj0UFtIOe6O82xyp6ccpJJgwUrINsoUHn4RPLwtYuroiIKNKjrwiUA== X-Received: by 2002:a05:651c:290:: with SMTP id b16mr4703440ljo.178.1633192733980; Sat, 02 Oct 2021 09:38:53 -0700 (PDT) Received: from localhost.localdomain ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id h11sm1081487lfc.297.2021.10.02.09.38.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Oct 2021 09:38:53 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 2 Oct 2021 19:38:28 +0300 Message-Id: <20211002163834.29583-8-go.wigust@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211002163834.29583-1-go.wigust@gmail.com> References: <20211002163834.29583-1-go.wigust@gmail.com> 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/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 | 2 +- gnu/{home-services => home/services}/shepherd.scm | 2 +- gnu/local.mk | 2 +- tests/guix-home.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename gnu/{home-services => home/services}/shepherd.scm (99%) diff --git a/gnu/home-services/mcron.scm b/gnu/home-services/mcron.scm index fdfde179a5..fb044351a9 100644 --- a/gnu/home-services/mcron.scm +++ b/gnu/home-services/mcron.scm @@ -20,8 +20,8 @@ (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/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/local.mk b/gnu/local.mk index 78ca4688e3..5e3722a2d8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -79,7 +79,7 @@ GNU_SYSTEM_MODULES = \ %D%/home/services/fontutils.scm \ %D%/home/services/configuration.scm \ %D%/home/services/shells.scm \ - %D%/home-services/shepherd.scm \ + %D%/home/services/shepherd.scm \ %D%/home-services/mcron.scm \ %D%/home/services/utils.scm \ %D%/home/services/xdg.scm \ diff --git a/tests/guix-home.sh b/tests/guix-home.sh index cb015c907f..86ba42bb8b 100644 --- a/tests/guix-home.sh +++ b/tests/guix-home.sh @@ -75,7 +75,7 @@ fi cat > "$tmpfile" <