From patchwork Sat Oct 2 13:43:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 356 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 1742E27BBE3; Sat, 2 Oct 2021 14:45: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 9AD4027BBE1 for ; Sat, 2 Oct 2021 14:45:11 +0100 (BST) Received: from localhost ([::1]:51012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWfKA-0006ta-MR for patchwork@mira.cbaines.net; Sat, 02 Oct 2021 09:45:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40906) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWfK2-0006pz-Bb for guix-patches@gnu.org; Sat, 02 Oct 2021 09:45:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46774) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWfK2-0000lu-3U for guix-patches@gnu.org; Sat, 02 Oct 2021 09:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWfK2-0002lH-1c for guix-patches@gnu.org; Sat, 02 Oct 2021 09:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50967] [PATCH 00/12] Move (gnu home-services XYZ) to (gnu services XYZ) Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Oct 2021 13:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50967 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50967@debbugs.gnu.org Cc: Oleg Pykhalov X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163318225810542 (code B ref -1); Sat, 02 Oct 2021 13:45:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Oct 2021 13:44:18 +0000 Received: from localhost ([127.0.0.1]:58320 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWfJK-0002jy-2f for submit@debbugs.gnu.org; Sat, 02 Oct 2021 09:44:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:52742) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWfJI-0002jq-Hj for submit@debbugs.gnu.org; Sat, 02 Oct 2021 09:44:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWfJI-0005kg-3p for guix-patches@gnu.org; Sat, 02 Oct 2021 09:44:16 -0400 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]:36390) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWfJG-0000Cp-Gj for guix-patches@gnu.org; Sat, 02 Oct 2021 09:44:15 -0400 Received: by mail-lf1-x12b.google.com with SMTP id b20so50599121lfv.3 for ; Sat, 02 Oct 2021 06:44:13 -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=Nhi3FCUttbAq8QKTv3UCES/mLnFMXIqUpyqvdqNo+HE=; b=Y766F4f8aYTfan8OveVecQuRfiylIq7FaMT3pYZcq0gtSkwjIAUqKHnvw751cGCTj2 kBOlTk6ec0JmJ+UE9FXuU9a3i2qdgrvb95vxHa0kYAz8q3LriWV2lcKLlo3EqnWWe3HG WSjzKeTpRr3gmqlaQX7EsInJvS9kONfTGS1F5e3LXfAnj6Alixl0IL1H+PMp8sTUnUPD SDpA4qqTXePkSSFTjz+1kOeaeF/DwrCy92LkK2rmsKf3aH8FSfoStN8fFvuEtneloNNT P6DoYMqbzYZst/dzm4MOt+LBsyo0lER+lCqixKT6QseZ8r2t4BqZwYIH4PGiXEF91qD7 cyZQ== 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=Nhi3FCUttbAq8QKTv3UCES/mLnFMXIqUpyqvdqNo+HE=; b=Yye4xir7gfr4ktumhGdUiSF2wKjapfQJv1TN0CcK3TFEUGqS+ZUQLEIxyJWtp/eyXs mVBqQJQM2J6DWnaX7rZywrDmBOuwc5djaia9F7rExHGChXPXNO9gkyy9d49vQJYue7Z1 TEnKrDO4/RxgXcnRhe99VGWs5jfcWeDDyFtuDDTsykvUubHyy428nV60h3iVAjSjwqjn GRqbjArxFWGaKXwa+tgtLIEIcmI3YZI2iryEFNuSTa0ki1tFYLGJLC7oL5vqiEOQ+CfW ZC3f6d9RYL1Mbm7+2LCFHTIRnMr4ErmdCU+HD6dyyxcDeXIsBjc2ZiKzmturzJSQrOsW GpwA== X-Gm-Message-State: AOAM5320c6goUgZLlAawM4pzEH0jKipXfdU5TaMqZ4pR+6996i9Brgbt 1ZVAkoAxAUvTLfQQxHLUg87Ak21J+AU= X-Google-Smtp-Source: ABdhPJzkywgW3WSBJhfn1TmCc2zuv8u/SCQrYRmJ5Z/25MeERJtOCnjhdU0Fkx8VckgVJ1l1ZX8SLw== X-Received: by 2002:a2e:a5c8:: with SMTP id n8mr3752558ljp.307.1633182251744; Sat, 02 Oct 2021 06:44:11 -0700 (PDT) Received: from localhost.localdomain ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id r3sm1050863lfc.169.2021.10.02.06.44.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Oct 2021 06:44:11 -0700 (PDT) From: Oleg Pykhalov Date: Sat, 2 Oct 2021 16:43:52 +0300 Message-Id: <20211002134352.5735-1-go.wigust@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12b; envelope-from=go.wigust@gmail.com; helo=mail-lf1-x12b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 This patch series moves (gnu home-services XYZ) to (gnu services XYZ) for: 1. Better module naming (discussed at https://lists.gnu.org/archive/html/guix-devel/2021-09/msg00169.html ) 2. Easier code sharing. E.g. (gnu home-services mcron) uses ‘@@’ which should never be used, and not guaranteed to work these days, due to inlining. Tests: passes ‘make check TESTS=tests/guix-home.sh’ succeeded ‘./pre-inst-env guix home build …/home.scm’ succeeded ‘./pre-inst-env guix home reconfigure …/home.scm’ Andrew Tropin (1): tests: Add tests for guix home cli. Oleg Pykhalov (11): gnu: home-services: Move configuration to (gnu services). gnu: home-services: Move symlink-manager to (gnu services). gnu: home-services: Move utils to (gnu services). gnu: home-services: Move fontutils to (gnu services). gnu: home-services: Move shells to (gnu services). gnu: home-services: Move xdg to (gnu services). gnu: home-services: Move shepherd to (gnu services). gnu: home-services: Move mcron to (gnu services). gnu: home-services: Change %service-type-path and filter services. scripts: home: (gnu home-services bash) -> (gnu services bash). doc: (gnu home-services) -> (gnu services). Makefile.am | 1 + doc/guix.texi | 8 +- doc/he-config-bare-bones.scm | 2 +- gnu/home-services.scm | 9 +- gnu/home-services/configuration.scm | 109 -------------- gnu/home-services/mcron.scm | 115 --------------- gnu/home-services/shepherd.scm | 134 ------------------ gnu/home.scm | 8 +- gnu/local.mk | 13 +- gnu/services/configuration.scm | 89 +++++++++++- gnu/{home-services => services}/fontutils.scm | 2 +- gnu/services/mcron.scm | 89 +++++++++++- gnu/{home-services => services}/shells.scm | 6 +- gnu/services/shepherd.scm | 112 ++++++++++++++- .../symlink-manager.scm | 2 +- gnu/{home-services => services}/utils.scm | 2 +- gnu/{home-services => services}/xdg.scm | 6 +- guix/scripts/home/import.scm | 2 +- tests/guix-home.sh | 99 +++++++++++++ 19 files changed, 417 insertions(+), 391 deletions(-) delete mode 100644 gnu/home-services/configuration.scm delete mode 100644 gnu/home-services/mcron.scm delete mode 100644 gnu/home-services/shepherd.scm rename gnu/{home-services => services}/fontutils.scm (98%) rename gnu/{home-services => services}/shells.scm (99%) rename gnu/{home-services => services}/symlink-manager.scm (99%) rename gnu/{home-services => services}/utils.scm (98%) rename gnu/{home-services => services}/xdg.scm (99%) create mode 100644 tests/guix-home.sh