diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2019-08-07 22:26:55 +0200 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2019-08-07 22:26:55 +0200 |
commit | 9bd1333e587c92fb3f0c12e080cb89e41713df01 (patch) | |
tree | f053e0174c052df046ef2ad320bcc5cdc8c76b01 /guix/scripts/deploy.scm | |
parent | 378d94e51b00c30b19a39154278d01f1f3c4dbc1 (diff) | |
parent | 55e238f2ab24ce347047ebc7fd7c5eba62dac69d (diff) | |
download | guix-patches-9bd1333e587c92fb3f0c12e080cb89e41713df01.tar guix-patches-9bd1333e587c92fb3f0c12e080cb89e41713df01.tar.gz |
Merge remote-tracking branch 'origin/master' into wip-texlive
Diffstat (limited to 'guix/scripts/deploy.scm')
-rw-r--r-- | guix/scripts/deploy.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index 52bba3f3bf..ebc99e52cc 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) @@ -74,7 +75,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) |