From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6E5+HevsPmHt0gAAgWs5BA (envelope-from ) for ; Mon, 13 Sep 2021 08:17:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id +zIiGevsPmFGewAA1q6Kng (envelope-from ) for ; Mon, 13 Sep 2021 06:17:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A94601FE9E for ; Mon, 13 Sep 2021 08:17:14 +0200 (CEST) Received: from localhost ([::1]:33048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPfHF-0002wF-H2 for larch@yhetil.org; Mon, 13 Sep 2021 02:17:13 -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 Content-Type: multipart/signed; boundary="=-=-=" 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1631513835; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=GyUNqbyGyrmt5hqXX/P2BaY40Rw8Gf/Q6jaVPbr1GLk=; b=orEsW2gwnojPhBYGhStuMwLImMzZkn0kibX+kwXkG1RttDjknjD7BDnLieYkwzqmiyjnXc Q9oNxVKnUmsc53NhY0YzSrIqFua4HY6wo1jTv96pr7HIhoZXqvIG6pc6lwJmP8vcT4+8Ew PNzzNh/19LjuaYXW1FNJqh1LVN6zg0mpiIs48kkk5aYrLO7CC+UCxmqcIbsiigzHZTqdAQ EHsPCoEo4Tmf+GMVSX9IKaXFBH5djgGrlVRSNNm2zTxLnxXcB966DeWNvtyM5hdShvxfLO GtogScL15/9mU/RF2GkuwCnOlheo3m7McqEwFyYGHiB8jgCjdZe6NLi/bS3zag== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631513835; a=rsa-sha256; cv=none; b=Mee5rBrYccw2ZMuCTfcmpx42yYl7oGN0K2dDtoIGb9oQM42tPKMF2IaMb0nyzw8zDWhMdt tUlI3jRYFslihMydabdF2MPK7tcFhvaDEcwqzczsxUpPXB6CZ+QKRiLzBWHCJ8Agsv1gfv lAAeyBkZrRnPke44CC1f91CkbTCAg7ugnsJcWA1nkPqtuYV+SlimW5P8bOZnbmGyNEnQbT vlU4Paf0Tp6xwYQXs1CyQ71KREks/mU+9DztVjwsWOlbXWn1ihaD4C+9JSq4vlS4HDPB48 dYqVpG5STtlRFyk1Bhes0bsXiaDpZLB80iCabqtf9Kk+mnoVmGE6gNCUN7zn4w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop-in.20150623.gappssmtp.com header.s=20150623 header.b=QZlHuPev; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.01 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop-in.20150623.gappssmtp.com header.s=20150623 header.b=QZlHuPev; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: A94601FE9E X-Spam-Score: -2.01 X-Migadu-Scanner: scn0.migadu.com X-TUID: No7AfU+u6ufb --=-=-= Content-Type: multipart/mixed; boundary="==-=-=" --==-=-= Content-Type: text/plain Content-Disposition: inline I studied (guix self) source code very briefly, so I hope I did changes correctly. Let me know, please, if something is wrong here. --==-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-home-services-shepherd-Add-missing-exports.patch >From 437a3d8e898b428d8b2347fc73f8611f342fec77 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Fri, 10 Sep 2021 10:41:36 +0300 Subject: [PATCH 1/2] home-services: shepherd: Add missing exports. * gnu/home-services/shepherd.scm: Add missing exports. --- gnu/home-services/shepherd.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/home-services/shepherd.scm b/gnu/home-services/shepherd.scm index b9fd3c367b..120cfde1a1 100644 --- a/gnu/home-services/shepherd.scm +++ b/gnu/home-services/shepherd.scm @@ -27,6 +27,8 @@ #:use-module (srfi srfi-1) + #:export (home-shepherd-service-type + home-shepherd-configuration) #:re-export (shepherd-service shepherd-action)) -- 2.33.0 --==-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-guix-self-Add-home-modules.patch >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 --==-=-= Content-Type: text/plain Content-Disposition: inline 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(-) -- 2.33.0 --==-=-=-- --=-=-= Content-Type: application/pgp-signature; name=signature.asc Content-Transfer-Encoding: base64 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUVCQ2dBZEZpRUVLRUdheGxBNGRF REg2Uy82SWdqU0NWakIzckFGQW1FN1N1SUFDZ2tRSWdqU0NWakIKM3JDS1R4QUFrZXF2UzBrdnFw alZ5c0pZa1NnaElmYVZuMjRtempEUFNTbm5lVVdhdy9tUGxrZWhHaUE5VHRpMQppSHZGbVMvSmlF a1VLWkdvZFozSVRsN0tGU3pFekdQWWZ6bzJPejdFUjc0aHJlMEs5RTFldDVxRHhCUDFjSWFNClVJ bURyTTdXaDNPc3VsRTV6bEkyT2JlWDRIL0ladFh5SGVHanpqVUdkbnZRTjgxZjRCS05rZ1dzZDZq d3pvNEwKSUsrR3VlYUlVZE1rSmxWN3NldTlHb2tmTG9EWXI3RHRyekZuSzNDUTk1YlZqNGJvdmpM bUhRRk5aKzlqYTNCUwp3VXRDSjljeGM4cjI3aER0NTJoc2YvUW5RYzNHM00zUHdjRjdCSkhEMEdF MnpRclE1UzBFeDQ3cEhhVTVkRXo3CmVYTEN4ZFQrb3QzT2tLRlJXYTRYRlQ2bnRVckMwdHF2STFp bDZyVUdoQVV5Z1BSWmZtcmZaRjNEVlNSaDhxbmoKNGhJTTg2dXIzZjRsMUlUTFd3QkRFL29CR2FM aHdWQzNIcEZWT3hsYVp0ZmkzRHc3M1BkWnJ2a3F6alBKeFhGSwp1a3FWQnBPM2FZWU9UeFZqNU1U d2FtQnhaQ2taamVrb0FPNHBPdndwczZmVHFRLy9QWmRwdFdsbFBMaUZ5ZEQ0Ck1OQ2dKaGNqVkZx aWM3U3NJazZKWnV3VmlXUURyTFR3ak91VDNLQm5tVDdDZVl0dW1VS2s3YVl6OFVrWWZTU3oKY2Fu SWxicGZLTGRpYzdUMmNOaVBheC8rY0RaOTJnRnlCQWtnMU1IdVY4WXhES0xKWjVXNnlzR1JOQ0hV L2EyRQpFeTh1RE9sbEE5SUU0SVhFNGtoVkdlVjRrYy82U1lmOFpPWHo4d0ZUNGF5RFFjdnR1SE09 Cj1YNDV2Ci0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQ== --=-=-=--