diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-07-19 01:15:59 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-19 01:15:59 +0200 |
| commit | 2ee70a5b11e83e1abe4b749a21f15852f7fcf5e1 (patch) | |
| tree | 6cde1b54aa7dd8880321ebaf11d9e722e39156f2 /guix/scripts | |
| parent | 96783ed6275cd2818ff56916274e6e4582f1dc9b (diff) | |
| parent | 4678cc46a4c1e0538402d8df6d85d3caedc7f00b (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/pull.scm | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 7895c19914..54bbaddf30 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -52,6 +52,7 @@ #:use-module (srfi srfi-37) #:use-module (ice-9 match) #:use-module (ice-9 vlist) + #:use-module (ice-9 format) #:export (display-profile-content guix-pull)) @@ -162,16 +163,11 @@ Download and deploy the latest version of Guix.\n")) %standard-build-options)) -(define what-to-build - (store-lift show-what-to-build)) -(define indirect-root-added - (store-lift add-indirect-root)) - (define* (display-profile-news profile #:key concise? current-is-newer?) "Display what's up in PROFILE--new packages, and all that. If CURRENT-IS-NEWER? is true, assume that the current process represents the -newest generation of PROFILE.x" +newest generation of PROFILE." (match (memv (generation-number profile) (reverse (profile-generations profile))) ((current previous _ ...) @@ -197,7 +193,7 @@ newest generation of PROFILE.x" (_ #t))) (define* (build-and-install instances profile - #:key verbose? dry-run?) + #:key use-substitutes? verbose? dry-run?) "Build the tool from SOURCE, and install it in PROFILE. When DRY-RUN? is true, display what would be built without actually building it." (define update-profile @@ -210,6 +206,7 @@ true, display what would be built without actually building it." (mlet %store-monad ((manifest (channel-instances->manifest instances))) (mbegin %store-monad (update-profile profile manifest + #:use-substitutes? use-substitutes? #:hooks %channel-profile-hooks #:dry-run? dry-run?) (munless dry-run? @@ -604,6 +601,8 @@ Use '~/.config/guix/channels.scm' instead.")) (build-and-install instances profile #:dry-run? (assoc-ref opts 'dry-run?) + #:use-substitutes? + (assoc-ref opts 'substitutes?) #:verbose? (assoc-ref opts 'verbose?)))))))))))))) |