From patchwork Mon Sep 13 06:16:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Tropin X-Patchwork-Id: 32810 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 B148C27BBE3; Mon, 13 Sep 2021 07:17:17 +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_SIGNED, 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 30B1627BBE1 for ; Mon, 13 Sep 2021 07:17:17 +0100 (BST) Received: from localhost ([::1]:33048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPfHI-0002wF-7w for patchwork@mira.cbaines.net; Mon, 13 Sep 2021 02:17:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPfH5-0002w6-2B for guix-patches@gnu.org; Mon, 13 Sep 2021 02:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPfH4-0001Wz-RB for guix-patches@gnu.org; Mon, 13 Sep 2021 02:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mPfH4-0006bq-Mc for guix-patches@gnu.org; Mon, 13 Sep 2021 02:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50559] [PATCH 0/2] Add home modules to (guix self) Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Sep 2021 06:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50559 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50559@debbugs.gnu.org Cc: Oleg Pykhalov , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163151379325365 (code B ref -1); Mon, 13 Sep 2021 06:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Sep 2021 06:16:33 +0000 Received: from localhost ([127.0.0.1]:43937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mPfGb-0006ax-7A for submit@debbugs.gnu.org; Mon, 13 Sep 2021 02:16:33 -0400 Received: from lists.gnu.org ([209.51.188.17]:36450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mPfGW-0006am-8T for submit@debbugs.gnu.org; Mon, 13 Sep 2021 02:16:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPfGW-0002vc-0N for guix-patches@gnu.org; Mon, 13 Sep 2021 02:16:28 -0400 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]:40958) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPfGP-0000sp-Ku for guix-patches@gnu.org; Mon, 13 Sep 2021 02:16:27 -0400 Received: by mail-lf1-x133.google.com with SMTP id k4so18689213lfj.7 for ; Sun, 12 Sep 2021 23:16:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop-in.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version; bh=GyUNqbyGyrmt5hqXX/P2BaY40Rw8Gf/Q6jaVPbr1GLk=; b=QZlHuPevRs2WBpQzfmbxVp9YU2vcMKLCSVKzxWNTol7D1bYgarqGxcLNs4NW/6G66a Z/OhDx/U48epPozv/4mH5vCtRTUsGZfgt38g2E6diqMF6yw/kiBJwFxFUxIZc/RvGR83 hVfS01VArYn6VPQO30uNbwHrfHuT2WWWV1wMblHGrib3gXw7cfiV6DF38mz531V7GI/O 3MXqVE8rt1Q5WthfNmakEdEjbkgsgWLpQirmQIVoQ3Ry7ZXHgMrdGZdsizsSUaqu4K5H yvsqjfYb3Y01+3U8v6fekZVwVstwldBrHgrKrb4g4wixvYnL+f31FC2u7MXxAR2nVffP j3og== 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; bh=GyUNqbyGyrmt5hqXX/P2BaY40Rw8Gf/Q6jaVPbr1GLk=; b=AOsB54Oy2Dz5rG3g+R7DJdfK4uTqJaBKVsZY/T8VhYufCJ7XmVcY6rRJn/UBsl8hc3 xKUVgwocKUwEYfMUppRVnyu6C4aQN67DuLXHkc8/lPxGvQxE7bjR3EaIde+9woklgatn ooO34ChLeU8DcoSBpndOZemlBnowokZ+nYP+AA1cG07axAOllgyMyCZLTKaMsj70F4BG 15QXq2lw43PN896r/LIZd5YTMtBqV+ND1WrQKg1KenyNWoDE3f3rkLhgZwih472KyymT oKMfjFU0G/a/FzxjWf1AJoV05ETI/44//0EJGh6wgv/Fp3D46DsYgjryNlymumPS/WBN pWzQ== X-Gm-Message-State: AOAM533CxCg65GARXgMb4ITW+k1+bxsVDqX7FsGPG50N9OjwqXg1E2Dg OO06r8eH41VBjfImJqn8aENKEpbbRJ4Fpw== X-Google-Smtp-Source: ABdhPJw1z+KANWbiYLpvDWP75qJ6U09Rm6viQUe/fdKe3fwQaQqtVPHo44xHQcOX5+qYJmZ0Ew9A4g== X-Received: by 2002:a05:6512:132a:: with SMTP id x42mr7503769lfu.210.1631513779375; Sun, 12 Sep 2021 23:16:19 -0700 (PDT) Received: from localhost ([109.252.93.92]) by smtp.gmail.com with ESMTPSA id w19sm856166ljd.110.2021.09.12.23.16.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Sep 2021 23:16:18 -0700 (PDT) From: Andrew Tropin Date: Mon, 13 Sep 2021 09:16:16 +0300 Message-ID: <87czpdroen.fsf@trop.in> MIME-Version: 1.0 Received-SPF: none client-ip=2a00:1450:4864:20::133; envelope-from=andrew@trop.in; helo=mail-lf1-x133.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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 I studied (guix self) source code very briefly, so I hope I did changes correctly. Let me know, please, if something is wrong here. Andrew Tropin (2): home-services: shepherd: Add missing exports. guix: self: Add *home-modules*. gnu/home-services/shepherd.scm | 2 ++ guix/self.scm | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) From ce36535761b0189043256ea17b79a8672be96fac Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Fri, 10 Sep 2021 12:53:02 +0300 Subject: [PATCH 2/2] guix: self: Add *home-modules*. * guix/self.scm(*home-modules*): New variable. --- guix/self.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/guix/self.scm b/guix/self.scm index 79d93357a2..5922ea6aa1 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -958,13 +958,23 @@ itself." #:guile-for-build guile-for-build)) + (define *home-modules* + (scheme-node "guix-home" + `((gnu home) + (gnu home-services) + ,@(scheme-modules* source "gnu/home-services")) + (list *core-package-modules* *package-modules* + *extra-modules* *core-modules* *system-modules*) + #:extensions dependencies + #:guile-for-build guile-for-build)) + (define *cli-modules* (scheme-node "guix-cli" (append (scheme-modules* source "/guix/scripts") `((gnu ci))) (list *core-modules* *extra-modules* *core-package-modules* *package-modules* - *system-modules*) + *system-modules* *home-modules*) #:extensions dependencies #:guile-for-build guile-for-build)) @@ -1012,6 +1022,7 @@ itself." *cli-modules* *system-test-modules* *system-modules* + *home-modules* *package-modules* *core-package-modules* *extra-modules* -- 2.33.0