From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 08:46:46 2019 Received: (at submit) by debbugs.gnu.org; 7 Aug 2019 12:46:46 +0000 Received: from localhost ([127.0.0.1]:38165 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hvLL4-0000NB-3U for submit@debbugs.gnu.org; Wed, 07 Aug 2019 08:46:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:51899) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hvLL0-0000N1-MB for submit@debbugs.gnu.org; Wed, 07 Aug 2019 08:46:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48505) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvLKz-0008Fi-KD for guix-patches@gnu.org; Wed, 07 Aug 2019 08:46:42 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_20,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvLKy-0004aC-Ml for guix-patches@gnu.org; Wed, 07 Aug 2019 08:46:41 -0400 Received: from mx.sdf.org ([205.166.94.20]:65213) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hvLKy-0004Zn-Eq for guix-patches@gnu.org; Wed, 07 Aug 2019 08:46:40 -0400 Received: from Epsilon (pool-173-76-53-40.bstnma.fios.verizon.net [173.76.53.40]) (authenticated (0 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id x77Ckc3J000874 (using TLSv1.2 with cipher AES256-GCM-SHA384 (256 bits) verified NO) for ; Wed, 7 Aug 2019 12:46:39 GMT From: zerodaysfordays@sdf.lonestar.org (Jakob L. Kreuze) To: guix-patches@gnu.org Subject: [PATCH] deploy: Use all machine modules when loading deployment Date: Wed, 07 Aug 2019 08:43:27 -0400 Message-ID: <87mugl4040.fsf@sdf.lonestar.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 205.166.94.20 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * guix/scripts/deploy.scm (load-source-file): Enumerate and include all submodules of (gnu machine) when loading the provided deployment specification. =2D-- guix/scripts/deploy.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index bc1d93a93a..6a67985c8b 100644 =2D-- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -19,6 +19,7 @@ =20 (define-module (guix scripts deploy) #:use-module (gnu machine) + #:use-module (guix discovery) #:use-module (guix scripts) #:use-module (guix scripts build) #:use-module (guix store) @@ -73,7 +74,10 @@ Perform the deployment specified by FILE.\n")) =20 (define (load-source-file file) "Load FILE as a user module." =2D (let ((module (make-user-module '((gnu) (gnu machine) (gnu machine ssh= ))))) + (let* ((guix-path (dirname (search-path %load-path "guix.scm"))) + (environment-modules (scheme-modules* guix-path "gnu/machine")) + (module (make-user-module (append '((gnu) (gnu machine)) + environment-modules)))) (load* file module))) =20 (define (guix-deploy . args) =2D-=20 2.22.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEa1VJLOiXAjQ2BGSm9Qb9Fp2P2VoFAl1Kx28ACgkQ9Qb9Fp2P 2VpCnA/9FQpt+Um48VZZ4Q3OH9r9GjTXKEJ/eR/8SKCLT/uLXVueoE1bU0vE1W40 GSr7HtQmGzp6VCu6jJ6w7wSgQheUNoC4VHayN47eLSWUWqQPleRBmpP+xdDifTrq FsyUTBe4H+E1TnL76GX6dFB60DkyZcCAhEsA2W1Qn4BwsdRdVV3KXe7CegSuFRBm ceIxSuYbea4Fnqsj0Eq5ShIQwNrM09ZB5UvN8bEBgqFktQCbpo0u2SaZ+rkvd5M5 /vB5g1j1DqQXCDZDtreye5ixagw+0SDl/qmoTjPcTNjHFa9is33rbAkMQoSRLXjJ 17KdVmQRH8xlfYJKBjifXF9Vh/46JelyXz20PCQTfqspQWKt5xxPWsgmmGwyRUV5 u9ypdab+kZRvSAmnC6NISx+5L0hvXkzJ4IPEy3Br06/TMJmU/Xtgrtd/34raC8cV rggDRtLbLRgkhCdO5lp+mo1+M4kF+uI1zFCz/dhSU1qGylPP1MGZFF4Ry6NHEhjl x+CYZA7GaIZQwHK3OQsV+s0jxCJm3mYKODOcSnhptcNzBaRk89/tKhAtIXPV+G8L Bf7vjHIpZOlWJTYUVmbs0EmsLV3zBArXkJBtaH8Ze8MMUZtOKPrmtqj0+8hgfesJ Whh0d9UfQJYcr8qo78zg9XAuzqHeqZE6vK0oT68OYc5yshuDuGo= =qwa/ -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 07 16:07:20 2019 Received: (at submit) by debbugs.gnu.org; 7 Aug 2019 20:07:20 +0000 Received: from localhost ([127.0.0.1]:39481 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hvSDQ-0004We-4V for submit@debbugs.gnu.org; Wed, 07 Aug 2019 16:07:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:60414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hvSDM-0004WM-2h for submit@debbugs.gnu.org; Wed, 07 Aug 2019 16:07:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57256) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvSDK-0001DB-Nf for guix-patches@gnu.org; Wed, 07 Aug 2019 16:07:15 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40 autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvSDJ-0005rJ-S7 for guix-patches@gnu.org; Wed, 07 Aug 2019 16:07:14 -0400 Received: from dustycloud.org ([50.116.34.160]:44900) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hvSDJ-0005pj-OJ for guix-patches@gnu.org; Wed, 07 Aug 2019 16:07:13 -0400 Received: from twig (localhost [127.0.0.1]) by dustycloud.org (Postfix) with ESMTPS id 21E892661E; Wed, 7 Aug 2019 16:07:13 -0400 (EDT) References: <87mugl4040.fsf@sdf.lonestar.org> User-agent: mu4e 1.2.0; emacs 26.2 From: Christopher Lemmer Webber To: guix-patches@gnu.org Subject: Re: [bug#36954] [PATCH] deploy: Use all machine modules when loading deployment In-reply-to: <87mugl4040.fsf@sdf.lonestar.org> Date: Wed, 07 Aug 2019 16:07:12 -0400 Message-ID: <87wofooi33.fsf@dustycloud.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 50.116.34.160 X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: 36954-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Merged and pushed, thanks! Jakob L. Kreuze writes: > * guix/scripts/deploy.scm (load-source-file): Enumerate and include all > submodules of (gnu machine) when loading the provided deployment > specification. > --- > guix/scripts/deploy.scm | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm > index bc1d93a93a..6a67985c8b 100644 > --- a/guix/scripts/deploy.scm > +++ b/guix/scripts/deploy.scm > @@ -19,6 +19,7 @@ > > (define-module (guix scripts deploy) > #:use-module (gnu machine) > + #:use-module (guix discovery) > #:use-module (guix scripts) > #:use-module (guix scripts build) > #:use-module (guix store) > @@ -73,7 +74,10 @@ Perform the deployment specified by FILE.\n")) > > (define (load-source-file file) > "Load FILE as a user module." > - (let ((module (make-user-module '((gnu) (gnu machine) (gnu machine ssh))))) > + (let* ((guix-path (dirname (search-path %load-path "guix.scm"))) > + (environment-modules (scheme-modules* guix-path "gnu/machine")) > + (module (make-user-module (append '((gnu) (gnu machine)) > + environment-modules)))) > (load* file module))) > > (define (guix-deploy . args) From unknown Thu Sep 11 06:07:40 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 05 Sep 2019 11:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator