From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 6ExILRUDGGQhuwAASxT56A (envelope-from ) for ; Mon, 20 Mar 2023 07:54:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id uAgrLRUDGGQMswAAauVa8A (envelope-from ) for ; Mon, 20 Mar 2023 07:54:13 +0100 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 50E4870F for ; Mon, 20 Mar 2023 07:54:13 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pe9PF-0001Cp-4N; Mon, 20 Mar 2023 02:54:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pe9P9-0001Ay-8R for guix-patches@gnu.org; Mon, 20 Mar 2023 02:54:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pe9P8-0000bV-EF for guix-patches@gnu.org; Mon, 20 Mar 2023 02:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pe9P8-0005df-5U for guix-patches@gnu.org; Mon, 20 Mar 2023 02:54:02 -0400 Subject: bug#62274: [PATCH] home: 'home-environment-with-provenance' uses the HE location info. Resent-From: Andrew Tropin Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 06:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 62274 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Sergey Trofimov , 62274-done@debbugs.gnu.org Cc: paren@disroot.org, ludo@gnu.org, Sergey Trofimov Mail-Followup-To: 62274@debbugs.gnu.org, andrew@trop.in, sarg@sarg.org.ru Received: via spool by 62274-done@debbugs.gnu.org id=D62274.167929519821610 (code D ref 62274); Mon, 20 Mar 2023 06:54:01 +0000 Received: (at 62274-done) by debbugs.gnu.org; 20 Mar 2023 06:53:18 +0000 Received: from localhost ([127.0.0.1]:53528 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pe9OQ-0005cU-5O for submit@debbugs.gnu.org; Mon, 20 Mar 2023 02:53:18 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:60441) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pe9OO-0005cH-Ha for 62274-done@debbugs.gnu.org; Mon, 20 Mar 2023 02:53:17 -0400 Received: (Authenticated sender: andrew@trop.in) by mail.gandi.net (Postfix) with ESMTPSA id 89BC61BF207; Mon, 20 Mar 2023 06:53:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1679295190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=/JssbfQjzdELKz2FnP0sCPOXR5HrQArZh6SMhE6/RdE=; b=f2Zlun2RQe58FN4bADnzIktCe2ANBMtwOvXjIBlUyHUuGfwjb0HOwGncP+GaEz24TgR1OM lAuF99Jpv4LBjjs6MyewWSt3/DqBfPzhDG81dwblJsU+uFV/oC+kLGDK4dAz7Vq09PvAk7 PvLm4hkCxptpzekllLHXrIjtkjlVAn6R8wdE2j/AhTJi3DMqefbfgTj6OfiJwc+9XgVLaQ CogeSQZoV9E5RqBhSpOk+538XTSmY320TerfJqtYy0EUBagJL2Z8gTyhIs21t6PAb2yVhk cA4W6WRmYD95eF0DpCrrGgbQGYmJOH6hNEtJiBSHT878y7KsWwi+VVgp28XG3Q== From: Andrew Tropin In-Reply-To: <20230319154537.30463-1-sarg@sarg.org.ru> References: <20230319154537.30463-1-sarg@sarg.org.ru> Date: Mon, 20 Mar 2023 10:52:55 +0400 Message-ID: <87pm9352yg.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=f2Zlun2R; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679295253; a=rsa-sha256; cv=none; b=HrKuku6kpzZCeALn6KrMwyOMmrTOrtw6IpdyqF6QTrFFjM2tIqA2LdXk0tPsCtj4XfMAme jn6dPC3XHhnzMMI1B32Z726ielaPlULPg+iTH9byfTY313X8xYxm0rfMX3Apgq4m7nJ35F 0aOiGVrsC3kcOokRswK0ta5tefQ+QB5Bf+4k1Lx9viSkD2I5ScC7OnL+bIOgV99Rv4NkoM QhQncXzecvBZtFUnOBq2ncWDc4B/eTX6DQ8MIo7O6QKePlNNxVmY6OBgIS7zXXklxDQtNu V9GMdXAoXq3cjizXH2Ae2ZzpTuaDFb18DO70cZ7qlNKnhWZvGCC2wYxbpJJCcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679295253; 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-to:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=/JssbfQjzdELKz2FnP0sCPOXR5HrQArZh6SMhE6/RdE=; b=l8zddPvUXQsdKJG1ZcmJHdiq/z4KlA54jeTZiXdBu6vV3BWCameARjr67SI7euvkZE61DN 3aJlYpKeeQOfwYJB+u3BbE4u8HMwFAIICBqCPwaUZ/KJKvEhXCDSTCT9TL7M0H4nT6YCn8 XBO/7xZsWi+1om9ilKLt90i9Qxs40YD5DSoQFVxsAOsMR0zCCFELnmntaJF2aISrpldT5p RW9PcIMkobdOTW4AJmJNmUtDSwL8Ph1NBgIscl7LIfvqgYMUkHbWB8ss1wqxM3fIVeYhhG u5JT+P7llt8gJlcNAvTFlKETB4T/oHpPZLib55cOSFWS00CJqA4rGzOiReU0BQ== X-Migadu-Spam-Score: -3.95 X-Spam-Score: -3.95 X-Migadu-Queue-Id: 50E4870F X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=trop.in header.s=gm1 header.b=f2Zlun2R; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-TUID: dgs27cbyo4cQ --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On 2023-03-19 16:45, Sergey Trofimov wrote: > * gnu/home.scm (home-environment-with-provenance): Make `config-file` > optional, with the default taken from the HE location info. > --- > gnu/home.scm | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/gnu/home.scm b/gnu/home.scm > index 6d3f705758..2fefe7ba53 100644 > --- a/gnu/home.scm > +++ b/gnu/home.scm > @@ -103,7 +103,21 @@ (define* (home-environment-derivation he) > #:target-type home-service-type))) > (service-value home))) >=20=20 > -(define* (home-environment-with-provenance he config-file) > + > +(define (home-environment-configuration-file he) > + "Return the configuration file of HE, based on its 'location' field, o= r #f > +if it could not be determined." > + (let ((file (and=3D> (home-environment-location he) > + location-file))) > + (and file > + (or (and (string-prefix? "/" file) file) > + (search-path %load-path file))))) > + > +(define* (home-environment-with-provenance he > + #:optional > + (config-file > + (home-environment-configurat= ion-file > + he))) > "Return a variant of HE that stores its own provenance information, > including CONFIG-FILE, if available. This is achieved by adding an inst= ance > of HOME-PROVENANCE-SERVICE-TYPE to its services." Thank you for the patch, applied and pushed as 1f36534c7e8f2325bff4df5d37ecc811dc63fc38. =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmQYAscACgkQIgjSCVjB 3rBeAQ/9HAhyXU27Ke0ZuXHkmT0YZt7md6puchXG1aS1Nif14cb6EyTnz4RZHU2O hyL3pDDGMbVB33SyRO37I/s3CCoE0XXFk5MIjxKJX7BRwc7/NicfaIABqnmCzIMD mV2R4o21prT6G5hPUWeE/0fcxgQ5olu2C5bidvyEuoxjieBcxMPB6de+TQUpodzd gWE7aKqylUjsgmwOSylKLc1Ary660oHaD7u5JsqMJriGmzkQxMVptknlb9cq4gZV Gnsu09UsJo5Mc+Fo5/lcinz+eq61HgzqC5ZxPDHNpEMFrUZhtjMzE7+/tSHcHJHl 1fXyIZhwfTVEvppvxaxZrhCAh9TSHxF+VIJAkRI2yIjSR1L+GDfYWWPUE3wFsmN2 qF/1Aa5QDfHmPXCicQ7c9jo3eurvHiT/FYO8t8D3KdUXuXXcYdc4U3MbniwuPwLR NrOFXJofxzAeD1gI8OdeO8wZJRkiCbOdLg4ptaBCz3AQXjXIg2hJ3bUCfzVaGoWM beWIio5tBErNLhCVRgSOdl/riG3+tSPiPJCGAHP0bnaVXY7QrDavtbWitWBfwAkm d5rwlOSC3cw/IVf73BMfYheCn4Ou9gsMf86AG/aXRejkbiBRQpcfYYa24wxAUq06 qrA0/dm7hFhuoCkyKFVQYsxHXWR0heZtfx0K1Wo9ipxNfjENmno= =ozmU -----END PGP SIGNATURE----- --=-=-=--