[PATCH] deploy: Use all machine modules when loading deployment

  • Done
  • quality assurance status badge
Details
2 participants
  • Christopher Lemmer Webber
  • Jakob L. Kreuze
Owner
unassigned
Submitted by
Jakob L. Kreuze
Severity
normal
J
J
Jakob L. Kreuze wrote on 7 Aug 2019 14:43
(address . guix-patches@gnu.org)
87mugl4040.fsf@sdf.lonestar.org
* 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(-)

Toggle diff (26 lines)
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)
--
2.22.0
-----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-----

C
C
Christopher Lemmer Webber wrote on 7 Aug 2019 22:07
(address . guix-patches@gnu.org)(address . 36954-done@debbugs.gnu.org)
87wofooi33.fsf@dustycloud.org
Merged and pushed, thanks!

Jakob L. Kreuze writes:

Toggle quote (31 lines)
> * 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)
?