From patchwork Sat Oct 2 16:38:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 33570 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 2F07627BBE1; Sat, 2 Oct 2021 17:40:19 +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 1B14127BBE3 for ; Sat, 2 Oct 2021 17:40:18 +0100 (BST) Received: from localhost ([::1]:46122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWi3c-000275-UR for patchwork@mira.cbaines.net; Sat, 02 Oct 2021 12:40:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWi3O-00026F-AZ for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48896) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWi3O-0002vx-2Q for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWi3N-0008JT-TH for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50967] [PATCH 01/14] tests: Add tests for guix home cli. References: <20211002134352.5735-1-go.wigust@gmail.com> In-Reply-To: <20211002134352.5735-1-go.wigust@gmail.com> Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Oct 2021 16:40:01 +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 , Andrew Tropin Received: via spool by 50967-submit@debbugs.gnu.org id=B50967.163319274731789 (code B ref 50967); Sat, 02 Oct 2021 16:40:01 +0000 Received: (at 50967) by debbugs.gnu.org; 2 Oct 2021 16:39:07 +0000 Received: from localhost ([127.0.0.1]:60406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2L-0008FI-Pj for submit@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:06 -0400 Received: from mail-lf1-f53.google.com ([209.85.167.53]:34343) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2J-0008Eg-O0 for 50967@debbugs.gnu.org; Sat, 02 Oct 2021 12:38:56 -0400 Received: by mail-lf1-f53.google.com with SMTP id g41so51433442lfv.1 for <50967@debbugs.gnu.org>; Sat, 02 Oct 2021 09:38:55 -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:mime-version :content-transfer-encoding; bh=UkdCoo77p/t5vQjaQv+R/Tz/mjqWKuFuIBNUJn+AnCU=; b=FeRdMgBbqUxQOV5Y9FiLAvnOMrsSlcsbUfY98apaK7GtVtIy/5VLIOshyk7yiIjWKc OWaFjr68D4bL7JX/YAfnz84JU0Goo3xfFJ1bFZtZ+TqbszQmJYYw8ru5DeoPkOSQrryn dEXlAjOuOcEkxwX8Jg4itEf9S6p7mStHoQh0tB4uS94PflViA+wKqz0M2PD4tXCSDn1E 4nxSzxJGOx4BJS2LDFLCnlskdUUDWJFf7xWfItPqmXb/Nx8PSrqNTWbYvkHI0W2VRbA/ 4FdsEDXCmltE00yJC4MyblvS5MP2FO721ZhgL9Pvdhv9/IU+k+1TN4oWZqHk58C0Tpqi vWZg== 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:mime-version :content-transfer-encoding; bh=UkdCoo77p/t5vQjaQv+R/Tz/mjqWKuFuIBNUJn+AnCU=; b=BblOBYtKrHTze4CXbzqM319bctIsgk6DE/uRAkarvIfH0yUzeizWJ8gPNXSHpRLwaq PARcD/evf2FH8zBWTcTV9/gSE4DeWUDg1B392nFYyBx/71pxDJ2An3BJxQlobykib1Cv fb2xoAlcq9xmOtL+8s7bMOmAZR+MJzYiLpCD9lDO1/qWf7I00BUoo0xcWzJ5acFl6cv3 6Qr65hTDKQ6wYRe9rZ0V0GwcbeZ0Y25jKjt/kXaTa0AS2e/Eoi0Xf5f/ZfReeg09GZcn 6Hf7Jrsq/Vsbk18jWeeIN3pUUokG+7OLfUUex348U3KmV13K8/uB0EQEkm0SdLZFculR 8H+Q== X-Gm-Message-State: AOAM533GyV7tbgd9+TBuxt9vMKVnGI4QYTMZ4BL323rGUVEa1hh2Lo6J XKASs8Pr5sHe3ExpqCQ0dCtorSQPgso= X-Google-Smtp-Source: ABdhPJyOM2UsL5hMcdoBe7fJWWmR2k6Vyy1dpxp5OTpAobB8x4C7p1W0qrdoC2NjJnYSmAiFmyG/6A== X-Received: by 2002:a2e:7311:: with SMTP id o17mr4460034ljc.267.1633192729735; Sat, 02 Oct 2021 09:38:49 -0700 (PDT) Received: from localhost.localdomain ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id h11sm1081487lfc.297.2021.10.02.09.38.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Oct 2021 09:38:49 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 2 Oct 2021 19:38:21 +0300 Message-Id: <20211002163834.29583-1-go.wigust@gmail.com> X-Mailer: git-send-email 2.33.0 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 From: Andrew Tropin * tests/guix-home.sh: New file. * Makefile.am (SH_TESTS): Add tests/guix-home.sh. Signed-off-by: Oleg Pykhalov --- Makefile.am | 1 + tests/guix-home.sh | 99 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 tests/guix-home.sh diff --git a/Makefile.am b/Makefile.am index b66789fa0b..5bf2567dc8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -546,6 +546,7 @@ SH_TESTS = \ tests/guix-package-aliases.sh \ tests/guix-package-net.sh \ tests/guix-system.sh \ + tests/guix-home.sh \ tests/guix-archive.sh \ tests/guix-authenticate.sh \ tests/guix-environment.sh \ diff --git a/tests/guix-home.sh b/tests/guix-home.sh new file mode 100644 index 0000000000..cb015c907f --- /dev/null +++ b/tests/guix-home.sh @@ -0,0 +1,99 @@ +# GNU Guix --- Functional package management for GNU +# Copyright © 2021 Andrew Tropin +# +# This file is part of GNU Guix. +# +# GNU Guix is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or (at +# your option) any later version. +# +# GNU Guix is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Guix. If not, see . + +# +# Test 'guix home' cli. +# + +set -e + +guix home --version + +tmpfile="t-guix-home-$$" +errorfile="t-guix-home-error-$$" + +# Note: This directory is chosen outside $builddir so that relative file name +# canonicalization doesn't mess up with 'current-source-directory', used by +# 'local-file' ('load' forces 'relative' for +# %FILE-PORT-NAME-CANONICALIZATION.) +tmpdir="${TMPDIR:-/tmp}/t-guix-home-$$" +mkdir "$tmpdir" + +trap 'rm -f "$tmpfile" "$errorfile" "$tmpdir"/*; rmdir "$tmpdir"' EXIT + +# Reporting of syntax errors. + +cat > "$tmpfile"< "$errorfile" +then + # This must not succeed. + exit 1 +else + grep "$tmpfile:3:4: error: (packages): invalid field specifier" "$errorfile" +fi + + +cat > "$tmpfile"< "$errorfile" +then + # This must not succeed. + exit 1 +else + # Guile 3.0.6 gets line/column numbers for 'read-error' wrong + # (zero-indexed): . + grep "$tmpfile:4:1: missing closing paren" "$errorfile" || \ + grep "$tmpfile:3:0: missing closing paren" "$errorfile" +fi + +# Reporting of duplicate system service declaration. + +cat > "$tmpfile" < "$errorfile" +then + # This must not succeed. + exit 1 +else + grep "guix home: error: more than one target service of type 'home-shepherd'" "$errorfile" +fi + +# Searching. + +guix home search mcron | grep "^name: home-mcron" +guix home search job manager | grep "^name: home-mcron" From patchwork Sat Oct 2 16:38:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 33573 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 A9DCC27BBE1; 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 1EC9027BBE3 for ; Sat, 2 Oct 2021 17:41:00 +0100 (BST) Received: from localhost ([::1]:46942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWi4J-0002hd-7e for patchwork@mira.cbaines.net; Sat, 02 Oct 2021 12:40:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWi3P-00026e-DR for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48899) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWi3P-0002xx-6a for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWi3P-0008Jq-42 for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50967] [PATCH 04/14] gnu: home-services: Move utils 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:03 +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.163319274831811 (code B ref 50967); Sat, 02 Oct 2021 16:40:03 +0000 Received: (at 50967) by debbugs.gnu.org; 2 Oct 2021 16:39:08 +0000 Received: from localhost ([127.0.0.1]:60422 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2V-0008Gv-NK for submit@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:08 -0400 Received: from mail-lf1-f44.google.com ([209.85.167.44]:41481) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2L-0008Em-KA for 50967@debbugs.gnu.org; Sat, 02 Oct 2021 12:38:58 -0400 Received: by mail-lf1-f44.google.com with SMTP id j5so46885081lfg.8 for <50967@debbugs.gnu.org>; Sat, 02 Oct 2021 09:38:57 -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=gdqOeOuk6d8vgiwPKjAAvhzCVtXXi+4w4LW5zskK4xM=; b=CP/fLSZZX5g+6HQyvghi3gA0/hr94JHEtr9sbCtJbKrAxxliHSy+YARYPhhdNN9GSt VwD733iiBqdqqusg1NhqVxBFcUMUTPeBs8/+dP4MXtxzZfI4en3ZDtIdbAZ2IwCW5dgc UuGWvU+n4lL62BRzZXtRnspTKE597fk+6PlgND8ib879qla4k5KxjvhzndN50iotK0XA PEPFHL6Hz95zDl9EO2/QQRJnlk1XhkHry83x9bTZayrZuO4QD0A1poCbIA/AyaFQ05Vw pcB2ol+k9VNn07LwAP0wR+pM3qRHhhrvm0lovCM+9WjhMj+Fr5b3SDtryZMjMCMecOBF b4Lg== 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=gdqOeOuk6d8vgiwPKjAAvhzCVtXXi+4w4LW5zskK4xM=; b=MluGeDPBiRXt+HV2injV2zlseMY3w1q3C/Qyr7RpgRy5aeeHDTbEeS/dLT+QUv2uYS 3WAAWFv05AkHo0fNYjgVsji2qcgYvjmcDAuVm4lvFaAiwB5ffCvTdmY0KPfp/kr6hsun Jqe7qGRnIZ5hSYnGIJ7Xnus+UQ+6C5oq+YMK1TmPNId2I6fdTpFufytD77h6UqLHfcNP j2XzQdQqRqm2uYqRyZCGFIvy6IMsxmIw/hqQiek+J0f9ciSESsqsg8AmK5UinsXCP2un iQfOSv7TBTzE04/LitCctlYSc1nuyHTaGhYLT7MLB9/5MGa5H7Nua0raAa08rYE1dU5q Pybw== X-Gm-Message-State: AOAM533JvYJ39nTiXqW2l8CcDF7+4LoXTeKl7dRFrzVPfl3FRFV+MF+f Wb5L6jaYZvnJal06L8TpzbdBpn8ILo8= X-Google-Smtp-Source: ABdhPJzQ9LQjYPWxq1da8MoANpj1WvsWogPlevp1IqJMim712ppv0WOVcVNUFr/ruINE6iAHqsp1xw== X-Received: by 2002:a05:651c:1b4:: with SMTP id c20mr4600048ljn.484.1633192731571; Sat, 02 Oct 2021 09:38:51 -0700 (PDT) Received: from localhost.localdomain ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id h11sm1081487lfc.297.2021.10.02.09.38.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Oct 2021 09:38:51 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 2 Oct 2021 19:38:24 +0300 Message-Id: <20211002163834.29583-4-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/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/shells.scm | 2 +- gnu/home-services/xdg.scm | 2 +- gnu/{home-services => home/services}/utils.scm | 2 +- gnu/local.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename gnu/{home-services => home/services}/utils.scm (98%) diff --git a/gnu/home-services/shells.scm b/gnu/home-services/shells.scm index 2be35ac56e..4939f86b2c 100644 --- a/gnu/home-services/shells.scm +++ b/gnu/home-services/shells.scm @@ -20,7 +20,7 @@ (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 utils) #:use-module (gnu home-services) #:use-module (gnu packages shells) #:use-module (gnu packages bash) diff --git a/gnu/home-services/xdg.scm b/gnu/home-services/xdg.scm index 07b25e9e12..7f91da9ece 100644 --- a/gnu/home-services/xdg.scm +++ b/gnu/home-services/xdg.scm @@ -22,7 +22,7 @@ #: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/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/local.mk b/gnu/local.mk index 29dd4ae5b5..729cfda100 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -81,7 +81,7 @@ GNU_SYSTEM_MODULES = \ %D%/home-services/shells.scm \ %D%/home-services/shepherd.scm \ %D%/home-services/mcron.scm \ - %D%/home-services/utils.scm \ + %D%/home/services/utils.scm \ %D%/home-services/xdg.scm \ %D%/image.scm \ %D%/packages.scm \ From patchwork Sat Oct 2 16:38:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 33574 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 7C36D27BBE3; Sat, 2 Oct 2021 17:41:02 +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 41EAE27BBE1 for ; Sat, 2 Oct 2021 17:41:02 +0100 (BST) Received: from localhost ([::1]:46966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWi4L-0002iv-9Y for patchwork@mira.cbaines.net; Sat, 02 Oct 2021 12:41:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWi3P-00026m-Qb for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48900) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWi3P-0002ya-JP for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWi3P-0008Jy-HM for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50967] [PATCH 05/14] gnu: home-services: Move fontutils to (gnu services). Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Oct 2021 16:40:03 +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.163319274831818 (code B ref 50967); Sat, 02 Oct 2021 16:40:03 +0000 Received: (at 50967) by debbugs.gnu.org; 2 Oct 2021 16:39:08 +0000 Received: from localhost ([127.0.0.1]:60424 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2W-0008H2-2P for submit@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:08 -0400 Received: from mail-lf1-f41.google.com ([209.85.167.41]:37507) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2M-0008En-63 for 50967@debbugs.gnu.org; Sat, 02 Oct 2021 12:38:58 -0400 Received: by mail-lf1-f41.google.com with SMTP id i4so52188375lfv.4 for <50967@debbugs.gnu.org>; Sat, 02 Oct 2021 09:38:58 -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=+ZR9ijBqoTaUjxMzY9B410WgIq0lpNciaQGO4OdaACk=; b=EaAu4zZS0vn0cy3seluCMFB193DtMgYLJlJVef49HnyBY9YuDRNHXEcPvJbKKRKSeB q9JxjDk0K2GDX38nq9Ol7rRC7ejn0ZLEJiFzgoUGM/5DUfhkNRYIFuDUNLBBtyYmnGus opv1srsgqOv+MtbUrmakbtnjpuhCue1gcvdjxsBIAdsZMbAxMEwtIDVYrKszga8GCSyx ozGG0TWyme6sY0go707leyTJH2YDzgfY9DZwhjCqWEckOP6wxh0Q0MGt2YfOBMw/T7Vc j4I2JAySq1e8nxBqau3sKvcRzRGKi8RRVTeTfS7hyr7e7ziH/9LO4yNJ1pSwfAmqCPU9 lzNA== 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=+ZR9ijBqoTaUjxMzY9B410WgIq0lpNciaQGO4OdaACk=; b=68fXqwJNEgINBMW77fAFc8DpmXMIz3aIJYtWz+QEj3w2Tw0VQvmVMuBwyq2xkgX+6E 18sqdM3qb5fSBZjpR/El+Vw8LvhlEali31nBsHzXgaFrBe8cy3hpTT2VIc2Ne218V3B6 pKX+bynt+COK8T18Y+JtmJrTOm6ps9ZfnOcuOD/h9FvrrSm/o42b3lxY9DABPips8hnt FR6Lrz4fXSEKl9+lMAXO3MQfCqy0foID+8MQbUJvWCoYkQ7nIbwRnNBIEuCZLK+StE86 k7GQaLQSP2ZozFogNanKLrgsZn62hyjepvr9qqJLOh4pHz0nbx5fKZgDR1+DTktREPjg p4Ag== X-Gm-Message-State: AOAM532C2IwmNnU7ai14NPEjswyvKUKolkwpv0BqgCYyJFaX41+3R88W 2nY/veeS6cziywyhDAlW3jySzRjWFrA= X-Google-Smtp-Source: ABdhPJx3ZV4wgJZPb8ZYWDF7/fDn8QT+RzU7O6MNY+IJX6xcvYxHEbxyzFZbWBR0QLQx1Csh3IOTRQ== X-Received: by 2002:a2e:585a:: with SMTP id x26mr4539887ljd.257.1633192732219; Sat, 02 Oct 2021 09:38:52 -0700 (PDT) Received: from localhost.localdomain ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id h11sm1081487lfc.297.2021.10.02.09.38.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Oct 2021 09:38:51 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 2 Oct 2021 19:38:25 +0300 Message-Id: <20211002163834.29583-5-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/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.scm | 2 +- gnu/{home-services => home/services}/fontutils.scm | 2 +- gnu/local.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename gnu/{home-services => home/services}/fontutils.scm (98%) diff --git a/gnu/home.scm b/gnu/home.scm index c981c5aef9..5591d12704 100644 --- a/gnu/home.scm +++ b/gnu/home.scm @@ -21,7 +21,7 @@ #: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 fontutils) #:use-module (gnu services) #:use-module (guix records) #:use-module (guix diagnostics) 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/local.mk b/gnu/local.mk index 729cfda100..dbc4221937 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -76,7 +76,7 @@ GNU_SYSTEM_MODULES = \ %D%/home.scm \ %D%/home-services.scm \ %D%/home/services/symlink-manager.scm \ - %D%/home-services/fontutils.scm \ + %D%/home/services/fontutils.scm \ %D%/home/services/configuration.scm \ %D%/home-services/shells.scm \ %D%/home-services/shepherd.scm \ From patchwork Sat Oct 2 16:38:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 33765 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 18A0227BBE4; Sat, 2 Oct 2021 17:41:12 +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 A23CF27BBE3 for ; Sat, 2 Oct 2021 17:41:11 +0100 (BST) Received: from localhost ([::1]:47790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWi4U-0003I5-M4 for patchwork@mira.cbaines.net; Sat, 02 Oct 2021 12:41:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWi3Q-00027H-9B for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48901) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWi3Q-0002yg-1I 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 1mWi3P-0008K5-Vt for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50967] [PATCH 06/14] gnu: home-services: Move shells 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:03 +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.163319274831826 (code B ref 50967); Sat, 02 Oct 2021 16:40:03 +0000 Received: (at 50967) by debbugs.gnu.org; 2 Oct 2021 16:39:08 +0000 Received: from localhost ([127.0.0.1]:60426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2W-0008H9-BG for submit@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:08 -0400 Received: from mail-lf1-f54.google.com ([209.85.167.54]:36544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2M-0008Ep-M6 for 50967@debbugs.gnu.org; Sat, 02 Oct 2021 12:38:59 -0400 Received: by mail-lf1-f54.google.com with SMTP id b20so52012977lfv.3 for <50967@debbugs.gnu.org>; Sat, 02 Oct 2021 09:38:58 -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=WnDH519wP2wdRYyVZCHH6a4WubsR3pD98p+AwgxWJmw=; b=DBs0S/xMR0dibyE/z7cnHkZpmHAIexYDc0xxqEfHcwEHbE+bVmGykkSVSGQReV4UVj AF809FoLZnMSn94VnjsA680lHoqXZFtODTkJ5AouDqtfCUCjASCs9RsjHIjYFhW7zWX8 nCF7nuKUEGnIrXew/FeEQLQWIzvnGWf521/lKRFHx7772/9OpoC8YsocTf/cXQRdgLWi veh4IU6zcznoDexjGvh8qcoxDXzm2Rmzn46OSWIlHb+YGp/g37jao7mola4fxVk5T9Bf z94LGTpoQqeOlX3+zB0fG4OWNgiRHPyNwgcG33aikebsfodRcysZYSTtJTxhPkae9FhK u4PQ== 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=WnDH519wP2wdRYyVZCHH6a4WubsR3pD98p+AwgxWJmw=; b=00L9FKMrT9ns81fumMjUxYdUpIl/JFmmA1gMI9/hVgWavUoTnjPqhZW6qrRyVTjXs8 FjBHoCTFcBy35jNNV9yh6IWxr3U7u3yaSjeEUdP5CdD2ttJnO1CVc8rY1ruGbOUMkCe3 y9IRsfNK5/ol6KB/nnxfVv3J1sH6Kz+yxaMXALltorgYor4NZW+byOaI8kKm3aNvLnj9 1EpY788zwRvhxd5MiufdrdJPZKNWOsqQ9hoO1k/Y8UgkHEKUpyydPyNsULLWJfyskKNo LbWPgRdhbZn5AWAuAAq4cDVH7GOCFS215LJ9uvp7uKQcxO3pt3+hkFEZcZHX0XtjXp7V ZIxg== X-Gm-Message-State: AOAM530tbDqHVP3wOs4fMs75io/DSBoGWlAhMhk083uVn8NwTMdT49Xn ig1+SldRH/Or8/vD3e4XM936xHc1O9I= X-Google-Smtp-Source: ABdhPJyM9BW8y9OhNqG5Qa6IHpc6b4JFfttyIrLF8q980x+w7Yytmiswav9ZusUJ51CuSHv151Y7Mw== X-Received: by 2002:a2e:9115:: with SMTP id m21mr4586560ljg.328.1633192732792; Sat, 02 Oct 2021 09:38:52 -0700 (PDT) Received: from localhost.localdomain ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id h11sm1081487lfc.297.2021.10.02.09.38.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Oct 2021 09:38:52 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 2 Oct 2021 19:38:26 +0300 Message-Id: <20211002163834.29583-6-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/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. --- doc/he-config-bare-bones.scm | 2 +- gnu/home.scm | 2 +- gnu/{home-services => home/services}/shells.scm | 2 +- gnu/local.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename gnu/{home-services => home/services}/shells.scm (99%) 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.scm b/gnu/home.scm index 5591d12704..c0d4c71d51 100644 --- a/gnu/home.scm +++ b/gnu/home.scm @@ -19,7 +19,7 @@ (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 shells) #:use-module (gnu home-services xdg) #:use-module (gnu home services fontutils) #:use-module (gnu services) 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 4939f86b2c..2308371dd0 100644 --- a/gnu/home-services/shells.scm +++ b/gnu/home/services/shells.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 shells) +(define-module (gnu home services shells) #:use-module (gnu services configuration) #:use-module (gnu home services configuration) #:use-module (gnu home services utils) diff --git a/gnu/local.mk b/gnu/local.mk index dbc4221937..2e48a70130 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -78,7 +78,7 @@ GNU_SYSTEM_MODULES = \ %D%/home/services/symlink-manager.scm \ %D%/home/services/fontutils.scm \ %D%/home/services/configuration.scm \ - %D%/home-services/shells.scm \ + %D%/home/services/shells.scm \ %D%/home-services/shepherd.scm \ %D%/home-services/mcron.scm \ %D%/home/services/utils.scm \ From patchwork Sat Oct 2 16:38:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 33571 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 51D5127BBE3; Sat, 2 Oct 2021 17:40:24 +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 1620827BBE1 for ; Sat, 2 Oct 2021 17:40:24 +0100 (BST) Received: from localhost ([::1]:46264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWi3j-0002Dx-79 for patchwork@mira.cbaines.net; Sat, 02 Oct 2021 12:40:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWi3Q-00028t-N8 for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48902) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWi3Q-0002yo-F5 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-0008KD-Cq for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50967] [PATCH 07/14] gnu: home-services: Move xdg 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.163319274931833 (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]:60428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2W-0008HH-NE for submit@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:09 -0400 Received: from mail-lf1-f42.google.com ([209.85.167.42]:34344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2N-0008Eq-CP for 50967@debbugs.gnu.org; Sat, 02 Oct 2021 12:38:59 -0400 Received: by mail-lf1-f42.google.com with SMTP id g41so51433790lfv.1 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=1hNcbKBj3u8w/mvvl6ira28WBV5SKsOMNGDSSV2lEOI=; b=a+01pQVKZtHIwN/b2V/XSNJ0Yz6DhX6YXw7LP4fb0D2K8WA5uCSh5ntVq8WCjLnDlG lUg78eHL3mpnVDYaq4j6usgu570CJYdaVR8qLqGaRGs3kBVihZeLYWosy9LbI9kfxcnv Y1TtKiysLUyTFOOoU5IIFdFXiBmzrXeOoxbe9L2qsM2hh0OLHVLNFwftDzmLWe9dtpFH LbuvfxF55IauDvSo7fPG9Lvi5N3HCx0fAQl8pXhK2jrayg7JSyN/UVyPiSV61IUzQO+t ra3ia6umaeNvH5NDO5J20l8XZoininKSXcaOU3nETNIP94RnJO0LT0m2kqkalcvxWfoM of5g== 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=1hNcbKBj3u8w/mvvl6ira28WBV5SKsOMNGDSSV2lEOI=; b=A/cHdGpmXCMsdsS1MY9WoAioRj3HcZrnO/DJZKAVQs1YZdLDsDbm7IhvleUFc9sly2 TqwGeCOMokS/ZTaSRCsF8H0ZknTAQ8ebJaDVRUuWqkMe+XKLuULIWDV2eP5Xa+t3Qwss vTP/qVCl0E+/kq1/Xf8rsVRGQgGiXxoY0VZvsfZizonaKDgJeW4QaB39Luw3gGPELnQa SHegXUGJEL6ia1wGCI6dSyC0sZTz6+vZnAl/BLafQ7dLrFqIMQ6CpBRt/lpsS2rcnkdb UqA9Ia7dSZl4jOvYbrx/E/ovbKfbVSF6QsIldqlozY8F5Ryd7jR/SnKNhkeWm5QsbyRg 00ug== X-Gm-Message-State: AOAM531Z6iv6shQoAtotJMeHyIof84MOL5H/3zpFIawXWk86y/gtVho8 uGFoDC82AuLLJGyoEM4H6HcfArnd5Mo= X-Google-Smtp-Source: ABdhPJx+Ros1zbwzl/knZMf2B9V6gjxlqb+kiHo7VEwfPeM4uG4pCWN15qCMaVMEDYcOQmHqa0Ttpw== X-Received: by 2002:ac2:5e75:: with SMTP id a21mr4524507lfr.557.1633192733406; 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.52 (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:27 +0300 Message-Id: <20211002163834.29583-7-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/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.scm | 2 +- gnu/{home-services => home/services}/xdg.scm | 2 +- gnu/local.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename gnu/{home-services => home/services}/xdg.scm (99%) diff --git a/gnu/home.scm b/gnu/home.scm index c0d4c71d51..5ac382dc5a 100644 --- a/gnu/home.scm +++ b/gnu/home.scm @@ -20,7 +20,7 @@ #: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 xdg) #:use-module (gnu home services fontutils) #:use-module (gnu services) #:use-module (guix records) 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 7f91da9ece..4aed9a5803 100644 --- a/gnu/home-services/xdg.scm +++ b/gnu/home/services/xdg.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 xdg) +(define-module (gnu home services xdg) #:use-module (gnu services configuration) #:use-module (gnu home services configuration) #:use-module (gnu home-services) diff --git a/gnu/local.mk b/gnu/local.mk index 2e48a70130..78ca4688e3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -82,7 +82,7 @@ GNU_SYSTEM_MODULES = \ %D%/home-services/shepherd.scm \ %D%/home-services/mcron.scm \ %D%/home/services/utils.scm \ - %D%/home-services/xdg.scm \ + %D%/home/services/xdg.scm \ %D%/image.scm \ %D%/packages.scm \ %D%/packages/abduco.scm \ 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" < X-Patchwork-Id: 33575 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 95F3427BBE3; Sat, 2 Oct 2021 17:41:03 +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 607C427BBE1 for ; Sat, 2 Oct 2021 17:41:03 +0100 (BST) Received: from localhost ([::1]:47144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWi4M-0002q7-FP for patchwork@mira.cbaines.net; Sat, 02 Oct 2021 12:41:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWi3R-0002CJ-MZ for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48904) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWi3R-0002zc-BI for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWi3R-0008KR-8r for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50967] [PATCH 09/14] gnu: home-services: Move mcron 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:05 +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.163319274931850 (code B ref 50967); Sat, 02 Oct 2021 16:40:05 +0000 Received: (at 50967) by debbugs.gnu.org; 2 Oct 2021 16:39:09 +0000 Received: from localhost ([127.0.0.1]:60432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2X-0008HV-Es for submit@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:09 -0400 Received: from mail-lf1-f46.google.com ([209.85.167.46]:33420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2O-0008Et-Jj for 50967@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:01 -0400 Received: by mail-lf1-f46.google.com with SMTP id y23so12429737lfb.0 for <50967@debbugs.gnu.org>; Sat, 02 Oct 2021 09:39:00 -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=14ds3EnoShi4zhByGnGXDzkJUj7LZfV1ZBU89ZlquH8=; b=mKynSVpA+CaSU0+Dcyky9KhF1Vs8NYcLayBV0ClsItF0KL1GyeOC9i34sLZ8CMOVEV ieszLvWcxyIojtaCfmN9BzzCuU4dkggdR7tdx6aF9LKLXdyCKVifwMXbZeyy0GklN69h 1o1JaEaxIxyfygn2HPM9CasJ81FbMLG8vrESusCV4IYBVZS7Gpg84VIWiSRsPnisA94q VXsZWZpf89ivkfOqa5nVPwbSuIS9AvJY1k+UQ/bLxd9WXVW/mrCzyn0+u5TZ9ZQyw9Gt HetU8FJDKrj/5n2veLQmQrS/tTSb0iHP77GoPniLBDk2xWDZK/uVMKJ4D1zeXhp6LrrY F5Cg== 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=14ds3EnoShi4zhByGnGXDzkJUj7LZfV1ZBU89ZlquH8=; b=KRREBlx/CNY9j0M7ki4v2mJxe6xZ8lOVyIR6oxGj8Dml/np+2/h6jpcGOaNCdGoLdB 0sR4GQvgJlqv+2vQqjBQMLMD7kwzEgGNm17AIdWvXS6gPN3EWanOhcdyM7g2LRqG6rF1 5SC9WM4nCxGQvEXiCaw7LjQ15GfOAxtLXONwAwjKtYAmWViN6wAg9QUYSQ97/rRTGizS daHvGnMDwAhm+VjT9J8e/sjStnxYuxFUpT1hOm9xJinvQ4XSif2LbM0tZ9mkk9T8rV1S egEzd2meOWONQ07JZdmv7FUYXCvBPQxvZFwwnn6k4uvkXpsblELpe1BG2GVbDRe1jutr fClQ== X-Gm-Message-State: AOAM533uC6m7t2JEgQuzVUJnCbCkXrDAJQw5bg8IH4PWNd53Ssje47TF PcRVitdEh04jnWVtMvKSe/ICvxljHT4= X-Google-Smtp-Source: ABdhPJwjtgj4K8sVAAO3FOdrvQNU7fWH+ntCsqXRJZz9N/FVzsMSBYdISfc1jdd0uJ+AWm8gPkAHiw== X-Received: by 2002:a2e:9ad7:: with SMTP id p23mr4545501ljj.527.1633192734614; Sat, 02 Oct 2021 09:38:54 -0700 (PDT) Received: from localhost.localdomain ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id h11sm1081487lfc.297.2021.10.02.09.38.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Oct 2021 09:38:54 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 2 Oct 2021 19:38:29 +0300 Message-Id: <20211002163834.29583-9-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/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). --- doc/guix.texi | 2 +- gnu/{home-services => home/services}/mcron.scm | 2 +- gnu/local.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename gnu/{home-services => home/services}/mcron.scm (99%) diff --git a/doc/guix.texi b/doc/guix.texi index a72a726b54..8edbcd4edf 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -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/gnu/home-services/mcron.scm b/gnu/home/services/mcron.scm similarity index 99% rename from gnu/home-services/mcron.scm rename to gnu/home/services/mcron.scm index fb044351a9..cc6faac47f 100644 --- a/gnu/home-services/mcron.scm +++ b/gnu/home/services/mcron.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 mcron) +(define-module (gnu home services mcron) #:use-module (gnu packages guile-xyz) #:use-module (gnu home-services) #:use-module (gnu services shepherd) diff --git a/gnu/local.mk b/gnu/local.mk index 5e3722a2d8..5e8b769ce9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -80,7 +80,7 @@ GNU_SYSTEM_MODULES = \ %D%/home/services/configuration.scm \ %D%/home/services/shells.scm \ %D%/home/services/shepherd.scm \ - %D%/home-services/mcron.scm \ + %D%/home/services/mcron.scm \ %D%/home/services/utils.scm \ %D%/home/services/xdg.scm \ %D%/image.scm \ From patchwork Sat Oct 2 16:38:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 33577 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 2D04127BBE3; Sat, 2 Oct 2021 17:41:13 +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 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 06C3027BBE1 for ; Sat, 2 Oct 2021 17:41:13 +0100 (BST) Received: from localhost ([::1]:47896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWi4W-0003MG-2H for patchwork@mira.cbaines.net; Sat, 02 Oct 2021 12:41:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWi3S-0002Dy-1T for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48905) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWi3R-00030V-NU for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWi3R-0008Ka-Lo for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50967] [PATCH 10/14] scripts: home: (gnu home-services bash) -> (gnu home services bash). Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Oct 2021 16:40:05 +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.163319275031857 (code B ref 50967); Sat, 02 Oct 2021 16:40:05 +0000 Received: (at 50967) by debbugs.gnu.org; 2 Oct 2021 16:39:10 +0000 Received: from localhost ([127.0.0.1]:60434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2X-0008Hd-P6 for submit@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:10 -0400 Received: from mail-lf1-f42.google.com ([209.85.167.42]:41493) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2P-0008Ev-2p for 50967@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:01 -0400 Received: by mail-lf1-f42.google.com with SMTP id j5so46885519lfg.8 for <50967@debbugs.gnu.org>; Sat, 02 Oct 2021 09:39:00 -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=h8BM7qpMImd6lq5eGn9fav1/w1cOxhRM2pyH5XjVtJ4=; b=NjXslbn21Ja1UE70mO0crAoJx4i3bn1c2C5twj9AOR1Xv8Eh9HujNWQ1AR7UExrgLN Mt7SIdQBgdxe9/mMpR09crSvviFJ9y0n2NVdO846Iq6FAIK1LeGlba5yaOoyMep0Atpt 8S2FZe+Q+1VB74p6A0/nLDyjZAnJK5XSg69nghkB69b26akiigROAdU7zi08FqI2y4hf C7JPGmmqu+LSH5HzDqAmN73OTInLOIpgJ3P/mZnMjQDh/yJFPr3OlBRXNkSRlmEf6BF6 0LkefmKYexO0KvoNmaP4xXo1aI4ATFI8ZNsjYO4aB72WR9dj/79AZwGyHsU6QXnFEyG4 Lx/w== 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=h8BM7qpMImd6lq5eGn9fav1/w1cOxhRM2pyH5XjVtJ4=; b=DV9BIeI6fzbd8DcuN6FzVEp8tCZXsROnIyK4p9kWJTdXI5d8oKAXZkKqw+P88hWaBn v3ZEt9e5a+5V3xlJD56AACfkh/9B562oMs9OFtIb3zRyCncxddFzk4QDPFpdi2RoV29h RHxxBtJ/5KN+KQ8HSzEQ0ubrN7aqMlW6dtsF/Oq9/6aisOc/aw15/22MrBi2SIUDpbEd XlOM5LMjSMdBvh0LxBm6keiOBac3CJ9OoQBYYVVxG6Z+uNsVr1vvLyl0K8pdj2mCRlHH tBt4bCnpIxFG/J47Ues8D5AFOqDcO7vaGXzn1/5cEl/VohvlF6B2PL9wZwkD3K5exqPV cmdg== X-Gm-Message-State: AOAM531O1DoEHOzthlD61xJkt+6aXzM1wj1Wl/sPtmBfgBU/0wt39UV8 Fdz26i71OPam5ewnAPoNQBGjEvbgBvU= X-Google-Smtp-Source: ABdhPJwUm2nj1N5wsuODo+2/0lJjLmI4ysthWBvjoRvXqKMmyzfXEU3LrulWUJmFGbggT0rpBWXS3A== X-Received: by 2002:ac2:4f01:: with SMTP id k1mr4602894lfr.266.1633192735231; Sat, 02 Oct 2021 09:38:55 -0700 (PDT) Received: from localhost.localdomain ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id h11sm1081487lfc.297.2021.10.02.09.38.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Oct 2021 09:38:54 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 2 Oct 2021 19:38:30 +0300 Message-Id: <20211002163834.29583-10-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 * guix/scripts/home/import.scm: Replace (gnu home-services bash) with (gnu home services bash). --- guix/scripts/home/import.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From patchwork Sat Oct 2 16:38:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 33579 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 9FF0127BBE4; Sat, 2 Oct 2021 17:41: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 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 4FB3F27BBE1 for ; Sat, 2 Oct 2021 17:41:21 +0100 (BST) Received: from localhost ([::1]:48672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWi4e-0003px-Dy for patchwork@mira.cbaines.net; Sat, 02 Oct 2021 12:41:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWi3S-0002Fq-G6 for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48906) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWi3S-000319-5v for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWi3S-0008Ki-3Q for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50967] [PATCH 11/14] doc: (gnu home-services) -> (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:06 +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.163319275031864 (code B ref 50967); Sat, 02 Oct 2021 16:40:06 +0000 Received: (at 50967) by debbugs.gnu.org; 2 Oct 2021 16:39:10 +0000 Received: from localhost ([127.0.0.1]:60436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2Y-0008Hm-2A for submit@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:10 -0400 Received: from mail-lf1-f44.google.com ([209.85.167.44]:37524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2P-0008F0-MB for 50967@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:02 -0400 Received: by mail-lf1-f44.google.com with SMTP id i4so52188869lfv.4 for <50967@debbugs.gnu.org>; Sat, 02 Oct 2021 09:39:01 -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=0tC7JVQaC30RauVc7oVxdE9YYGopQVOdB+AO7ZlMh9o=; b=Hc2XtUtKrX9QDyhdAa1eBctSpBWMcHFslopNMF2fQ08HSp0/J0rwD1sr8aapZfb0Ra O8HRUmvGRXRKhCoayFKl3RuMv9eLILUm2TYGv7I68s+x/ElbI4ch/eRuUw5JRwlwn3V5 R4lLe/P6mXP2pEP90TpKey0aa9qddV2v5wTEjd7JCkOhM2WQ0HZT9+PdwXNBPHfTeAhq nxiDi3oHH53vsxaNspKA6Ijmu/priiLInIkm5355Hnucs2NXEfVKrig3fIxpLadX59QQ pNlqnL5R8luPuzib2Kxs1+y7crAfdA3EPdzr24Ru6MUgrKexGUQmXVrpjCGzQtTz8YRZ 7x8g== 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=0tC7JVQaC30RauVc7oVxdE9YYGopQVOdB+AO7ZlMh9o=; b=DCXQSJ+pjKP/emwXLN0vi6hdFxeKkvF4T26jx2ab/tXjT15dl0hEWvg1MIFYuXhuNX 7o2r5GN0bQV7jqcDFAKM1bxmMzxW5vLFtD9HAsjm9+0cRXdMz/w6Qmu7CuTflsWsfJMY /P8APC4VSH3+dS5p2dhBOaan/ljau71GuGpG6TYOXX+Vgma4Mx42Uj874zCsr2AWsEi9 fc41V7aEHxDSKcaQ9sduqmWRHBqPXgg5hScXivEbOc4dIUqx5QLpKFlgAIaApLl6sSqk xJodzgMwImwMDq8kgAf2YlvREGFJfYPepsL7UaXuOAUf1G2oifuXgq9NalDiFQfFay/R RrbA== X-Gm-Message-State: AOAM5305Uew9H0e7DhDjydXBIgHAeCEDFlQwpiVCKogt5bkYJHMhc8Bx H3qHW53/4iubc6sSItgV0+yCaAKPXq8= X-Google-Smtp-Source: ABdhPJxG4Zk6svT4AizvvGYFqbOhgQvO+APCl3IELxHYaVd3gEPvBiFQ9Pv2vtQAm9Bu/6q6JABqWw== X-Received: by 2002:a05:651c:169c:: with SMTP id bd28mr4717809ljb.476.1633192735815; Sat, 02 Oct 2021 09:38:55 -0700 (PDT) Received: from localhost.localdomain ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id h11sm1081487lfc.297.2021.10.02.09.38.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Oct 2021 09:38:55 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 2 Oct 2021 19:38:31 +0300 Message-Id: <20211002163834.29583-11-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 * doc/guix.texi: Replace (gnu home-services) with (gnu home services). --- doc/guix.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 8edbcd4edf..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 From patchwork Sat Oct 2 16:38:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 33576 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 0A3DB27BBE5; Sat, 2 Oct 2021 17:41:12 +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 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 B0F5427BBE4 for ; Sat, 2 Oct 2021 17:41:11 +0100 (BST) Received: from localhost ([::1]:47770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWi4U-0003HN-Ny for patchwork@mira.cbaines.net; Sat, 02 Oct 2021 12:41:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWi3S-0002HN-U8 for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48907) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWi3S-00031r-JF for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWi3S-0008Kq-Gg for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50967] [PATCH 12/14] gnu: home-services: Update %service-type-path. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Oct 2021 16:40:06 +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.163319275031871 (code B ref 50967); Sat, 02 Oct 2021 16:40:06 +0000 Received: (at 50967) by debbugs.gnu.org; 2 Oct 2021 16:39:10 +0000 Received: from localhost ([127.0.0.1]:60438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2Y-0008Ht-98 for submit@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:10 -0400 Received: from mail-lf1-f54.google.com ([209.85.167.54]:42516) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2Q-0008F6-Am for 50967@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:02 -0400 Received: by mail-lf1-f54.google.com with SMTP id x27so51281663lfa.9 for <50967@debbugs.gnu.org>; Sat, 02 Oct 2021 09:39:02 -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=7MUlKEmXNzpME9hgtJTdOJPjIPE+fi8uB3k8IDKPBhc=; b=RL4ASIC4TrPI8U/XHxJ3UxMRQHGc5zB6z+6bSrimLOWh/fLWOSOkSSZeEhz1fQMvdx 4itNfZ3N7RoCW5y98SsWI0MJ2br5xGw8DYm2JQt+dGbSpMV+lskmmVlGcghd+PJbMfYE WDa/VLlAMT9xgP9MOlKUO9zWhqpJJ0q9cmsXVPJVRtFRC03/Gl92ti3rvpDgS3IhCNLx Ecbsh0EVgJYBEJhGzdMMthbWC4d9Nr2yYeGd7IOjLYZMFiP+O+UaTBqMuGJMemRc1LKe YR4SCbr3unTeaFZlTUD6mQj/kj1OYwDVwEfSVgz2Ak7j6MjKH+QTyAM4TaWWFjwzqoPl oCLg== 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=7MUlKEmXNzpME9hgtJTdOJPjIPE+fi8uB3k8IDKPBhc=; b=V/BqrlzRIEYphaXvxwOf+KvV6NeZCsYjBThCmhhnVUa0oPrf0WWsj0E8cyRH76if16 0EB/uQ4fMwKUmGghp9Uy+/+b3d360TT6MdclesVr2WBHByibkatC+8rNp9Sq/gsETRrU A9y+nmezMC2SPDvVXNDb5hrZzRCkWnPFkF4GFH9/pNipB/WZVGbd7hkHaV7GCbRJH8s9 Yqm5xqrkC0dtHe2EzAgEpKoiGA5beO7wKPuhqioa31C/9ONq+iY5qgwTDVFMujb9ENou zGK1+tK2A5e10ATkHL/cNP/PN+CXX8w5OtF4jtfKccso6WvbCn+UjXBfJGvsF7F0ltyD 5uVw== X-Gm-Message-State: AOAM533juc/ltq0xaYxiEuRup7p3MOZiF+MTREqQvpOLJWxQDpm0vl4x kAXjqAOaqlu6xZbakvY/+gwQu6FApnE= X-Google-Smtp-Source: ABdhPJwysaeBHdAf9IvFDncfidSZDVmpTuJEd9zDYqX0f0GYywzycEJughfAcgZHRRfIMSvqfIpJTg== X-Received: by 2002:a2e:7f05:: with SMTP id a5mr4410761ljd.261.1633192736467; Sat, 02 Oct 2021 09:38:56 -0700 (PDT) Received: from localhost.localdomain ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id h11sm1081487lfc.297.2021.10.02.09.38.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Oct 2021 09:38:56 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 2 Oct 2021 19:38:32 +0300 Message-Id: <20211002163834.29583-12-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.scm (%service-type-path): Search home services in "gnu/services". * gnu/home-services.scm: Update documentation string. --- gnu/home-services.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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))) From patchwork Sat Oct 2 16:38:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 33578 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 CE50927BBE3; Sat, 2 Oct 2021 17:41:13 +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 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 6C2E827BBE1 for ; Sat, 2 Oct 2021 17:41:13 +0100 (BST) Received: from localhost ([::1]:47962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWi4W-0003Og-Ht for patchwork@mira.cbaines.net; Sat, 02 Oct 2021 12:41:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWi3T-0002Is-92 for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48908) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWi3T-00032R-0P for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWi3S-0008Ky-Ua for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50967] [PATCH 13/14] home: services: configuration: Support file-like objects. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Oct 2021 16:40:06 +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.163319275031878 (code B ref 50967); Sat, 02 Oct 2021 16:40:06 +0000 Received: (at 50967) by debbugs.gnu.org; 2 Oct 2021 16:39:10 +0000 Received: from localhost ([127.0.0.1]:60440 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2Y-0008I0-G7 for submit@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:10 -0400 Received: from mail-lf1-f48.google.com ([209.85.167.48]:37532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2R-0008FH-1E for 50967@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:03 -0400 Received: by mail-lf1-f48.google.com with SMTP id i4so52189000lfv.4 for <50967@debbugs.gnu.org>; Sat, 02 Oct 2021 09:39:02 -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=AnPHvujA+CU3zczqc4/vpWQDKqC0E7gokczqbnKqoQM=; b=H4QWIb3IQ6l4LbRcU7qGew4kJ4/zZyMUHqtcr2yWDSaajxJLsS94jyrNpCwwgbwPWg IJos8GWHd08gbFMY5pcGF/Jqt59Nj8Mvr23CyRj5m/vgBhv3wYx48GU4+C9je30YE8cJ euplBKiqYr92101ee+v5YXB3lYyrjRLtgVcweQxcyL8k1IbmYIwKca35r0Gp6YHw/AfF TZt7gftw5IpC1icbWqel+t2eFkQ/gYeL4iQQCijPEgVlRl3MV7dU5Z0Om08u0w5u4b/0 93spf5YhuvJ0VOaRUT4jDGGItWf8Wr3kd5IBMIl07FnvlaEYuMPOKL8RDTX5ATigkmnn wvMQ== 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=AnPHvujA+CU3zczqc4/vpWQDKqC0E7gokczqbnKqoQM=; b=K4W9chBmYayRX93gv6kHT17t5PVRp2ewtwoj0qo0kqelEOaMkXtTs5LCQmhNrLF3u+ LQLJ06YpUpQeQ0wrb6wifpUUOSFj9XoNKaSpVwdLhlhr5mFm1gVBVp8XWm8y2VjdSt3C 2JKpyZY/u5iONV8C2/VxxbrjEbxDvcOUvxZ41NF1e9BAk4n0VZ/EOHvXuykGI9DiG+qo m5mo1FSTVorazbZTQIf6SEXkc9ZMyuSDt7CZ85MB18I6YsVnCOu8pV9cYHLvzmYLwamx 1c4LYGpibCRbXnqSpA8MAdVlD8uqJHsD9D6E4cpp8SB79tO6GCaQSK3uss/e62n37d2O 8bSg== X-Gm-Message-State: AOAM532cx9ifDSrkotA5b0RI8LTn1/nXtnondEZEFn4WFagRvtwF1veE EN3UmRfTCPRvtEU/pivbXdC3hVbR8NU= X-Google-Smtp-Source: ABdhPJyaVlGsX/pdgjL5IOYM9ooblGl67lZFtnkDFUBBW0bRogReym5uyAvCrhDE3QjV554dQSoHEg== X-Received: by 2002:a05:651c:988:: with SMTP id b8mr4440535ljq.187.1633192737027; Sat, 02 Oct 2021 09:38:57 -0700 (PDT) Received: from localhost.localdomain ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id h11sm1081487lfc.297.2021.10.02.09.38.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Oct 2021 09:38:56 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 2 Oct 2021 19:38:33 +0300 Message-Id: <20211002163834.29583-13-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/configuration.scm (interpose): Include content of files. (string-or-gexp?): Rename to 'file-or-string-or-gexp?' and check for file-like object. (serialize-string-or-gexp): Rename to 'serialize-file-or-string-or-gexp'. (text-config?): Call 'file-or-string-or-gexp?' intead of 'string-or-gexp?'. * guix/scripts/home/import.scm: (generate-bash-module+configuration): Don't call slurp-file-gexp. --- gnu/home/services/configuration.scm | 14 ++++++++++---- guix/scripts/home/import.scm | 8 +++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/gnu/home/services/configuration.scm b/gnu/home/services/configuration.scm index 5e7743e7d6..39db7a5693 100644 --- a/gnu/home/services/configuration.scm +++ b/gnu/home/services/configuration.scm @@ -59,7 +59,12 @@ DELIMITER interposed LS. Support 'infix and 'suffix GRAMMAR values." (G_ "The GRAMMAR value must be 'infix or 'suffix, but ~a provided.") grammar))) (fold-right (lambda (e acc) - (cons e + (cons (if (file-like? e) + #~(begin + (use-modules (ice-9 rdelim)) + (with-fluids ((%default-port-encoding "UTF-8")) + (with-input-from-file #$e read-string))) + e) (if (and (null? acc) (eq? grammar 'infix)) acc (cons delimiter acc)))) @@ -79,11 +84,12 @@ the list result in @code{#t} when applying PRED? on them." (define alist? list?) -(define (string-or-gexp? sg) (or (string? sg) (gexp? sg))) -(define (serialize-string-or-gexp field-name val) "") +(define (file-or-string-or-gexp? fsg) + (or (string? fsg) (gexp? fsg) (file-like? fsg))) +(define (serialize-file-or-string-or-gexp field-name val) "") (define (text-config? config) - (and (list? config) (every string-or-gexp? config))) + (and (list? config) (every file-or-string-or-gexp? config))) (define (serialize-text-config field-name val) #~(string-append #$@(interpose val "\n" 'suffix))) diff --git a/guix/scripts/home/import.scm b/guix/scripts/home/import.scm index c977ec3861..611f580e85 100644 --- a/guix/scripts/home/import.scm +++ b/guix/scripts/home/import.scm @@ -46,17 +46,15 @@ (home-bash-configuration ,@(if (file-exists? rc) `((bashrc - (list (slurp-file-gexp (local-file ,rc))))) + (list (local-file ,rc)))) '()) ,@(if (file-exists? profile) `((bash-profile - (list (slurp-file-gexp - (local-file ,profile))))) + (list (local-file ,profile)))) '()) ,@(if (file-exists? logout) `((bash-logout - (list (slurp-file-gexp - (local-file ,logout))))) + (list (local-file ,logout)))) '())))))) From patchwork Sat Oct 2 16:38:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 33766 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 A7F5027BBE1; Sat, 2 Oct 2021 17:41: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 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 62F9127BBE3 for ; Sat, 2 Oct 2021 17:41:21 +0100 (BST) Received: from localhost ([::1]:48676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWi4e-0003q7-Fr for patchwork@mira.cbaines.net; Sat, 02 Oct 2021 12:41:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWi3T-0002KS-N7 for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48909) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWi3T-00032k-Ei for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWi3T-0008L5-CD for guix-patches@gnu.org; Sat, 02 Oct 2021 12:40:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50967] [PATCH 14/14] doc: Document guix home import. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Oct 2021 16:40:07 +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.163319275131885 (code B ref 50967); Sat, 02 Oct 2021 16:40:07 +0000 Received: (at 50967) by debbugs.gnu.org; 2 Oct 2021 16:39:11 +0000 Received: from localhost ([127.0.0.1]:60442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2Y-0008I7-PI for submit@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:11 -0400 Received: from mail-lf1-f51.google.com ([209.85.167.51]:33435) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWi2R-0008FO-KA for 50967@debbugs.gnu.org; Sat, 02 Oct 2021 12:39:04 -0400 Received: by mail-lf1-f51.google.com with SMTP id y23so12430135lfb.0 for <50967@debbugs.gnu.org>; Sat, 02 Oct 2021 09:39:03 -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=RU0vSEjGbkrIF7dkL0W5JTQT/pp0Xa3x61DzraD5SME=; b=RrG1J48XQ5xAQ4U+0R8HIyPnUpz+7Rx3c6HdwVeiwX/0Jxf3t/x3xkJNjq9/tPtHjD X8wWfSq2dhZiWyqnlrDR+9vu7cHWlxwwX6uWyF/ubJdxv4w6R1RoErthcHdFEWyXITRY qYrtwQgqxUIAdlMwzLdTg7LN5AlGWtZW6dniHz7bO9A7vhAdWKvb4En34AEIVAl246SZ g3SeWFsGyMQTDsi84iWMnBbHMBBWRkuvJlWeSXIIPpaHa5bYGdBN6mkpMqBSnFH3fcPW b54f5SdkIrb9HiC97hIchxAlLIJH6NL2VXR4hL7z7pBsGhuhYjykQvW07jB3ogksx/nZ oSyQ== 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=RU0vSEjGbkrIF7dkL0W5JTQT/pp0Xa3x61DzraD5SME=; b=vtvcSz1AP1j57eyR6KQStBzAFzr7+WOQW4tVadvhcYlLAqH7zBTWRYXde8xJdUOyzk kU6zLsfT7O0JFlRo+7Op56DSmaHVLrJ8XhwV95vMCiocsSyq1JowmF4IGbiKWKqF8Kty KYHFNhm1dP4I+8toeWXFjzCjqIHalfLP1G2t6fpVcgLvK91YOqP9GHlBH/CvLe9poqqS bgRB5LSHcEbW3RSRbrjXrcn24w9/Gqc3l1YbFWsNHW+XTqAO5s8AuxzD6Dcn8BNkXTiF Mkdi9V5MxagC3hMuz6asNDXtZXb6qYAyML4FKJnjpw1vLvBC/KNh02BTujJ30tWpeThn 5zwA== X-Gm-Message-State: AOAM532Djqr2wNAV6K+lGfMT2pc6xSfqKb3S3xZzvwli0zVBl6uM4SCA YoIlRoHMDEjSE6wgn2ZERA12gRyz83w= X-Google-Smtp-Source: ABdhPJyNibYqo4VSo8Ox/8QcfwrhO9m0X46JhzTxzFNMZTT65XlZ6koEBQYl1S0uGyM4cUOqAjbO/g== X-Received: by 2002:a2e:1659:: with SMTP id 25mr4540832ljw.217.1633192737648; Sat, 02 Oct 2021 09:38:57 -0700 (PDT) Received: from localhost.localdomain ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id h11sm1081487lfc.297.2021.10.02.09.38.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Oct 2021 09:38:57 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 2 Oct 2021 19:38:34 +0300 Message-Id: <20211002163834.29583-14-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 * doc/guix.texi (Invoking guix home): Document guix home import. --- doc/guix.texi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index d641935e0f..2f09f50629 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -36091,6 +36091,10 @@ generations that are up to 10 days old: $ guix home list-generations 10d @end example +@item import +Generate a Scheme code template that could be saved as a file and passed +to @command{guix home reconfigure} command. + @end table @node Documentation