diff options
| author | Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> | 2019-07-31 09:20:27 -0400 |
|---|---|---|
| committer | Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org> | 2019-07-31 10:32:53 -0400 |
| commit | 1a81d4d0731257428b1f30e6b4674c968ecf52e9 (patch) | |
| tree | 87e3d613651c200fb1d6f9ed042b50629cc89462 /guix/scripts/deploy.scm | |
| parent | 5bbac24698d47fffd56d1299b3a54da5de95c100 (diff) | |
remote: Remove '--system' argument.merge-deploy
* gnu/services.scm (activation-script): Return a <program-file> rather
than a <scheme-file>.
* gnu/deploy.scm (guix-deploy): Remove handling for '--system'.
(show-help): Remove documentation for '--system'.
(%default-options): Remove default setting for 'system'.
Diffstat (limited to 'guix/scripts/deploy.scm')
| -rw-r--r-- | guix/scripts/deploy.scm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index 8eeb9ae7a..bc1d93a93 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -44,8 +44,6 @@ (define (show-help) (display (G_ "Usage: guix deploy [OPTION] FILE... Perform the deployment specified by FILE.\n")) - (display (G_ " - -s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\"")) (show-build-options-help) (newline) (display (G_ " @@ -67,8 +65,7 @@ Perform the deployment specified by FILE.\n")) %standard-build-options)) (define %default-options - `((system . ,(%current-system)) - (substitutes? . #t) + `((substitutes? . #t) (build-hook? . #t) (graft? . #t) (debug . 0) @@ -91,8 +88,7 @@ Perform the deployment specified by FILE.\n")) (for-each (lambda (machine) (info (G_ "deploying to ~a...~%") (machine-display-name machine)) - (parameterize ((%current-system (assq-ref opts 'system)) - (%graft? (assq-ref opts 'graft?))) + (parameterize ((%graft? (assq-ref opts 'graft?))) (guard (c ((message-condition? c) (report-error (G_ "failed to deploy ~a: '~a'~%") (machine-display-name machine) |