diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-05-26 17:11:20 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-05-26 17:11:20 +0200 |
| commit | 7097e98586df3110b80943a88c27804d65f214fa (patch) | |
| tree | 2e244b9fc19acc569d6abd42306aaf013f02da0d /guix/scripts/pull.scm | |
| parent | 15870cc08d20501e3526fa892111a43ae9e3e02f (diff) | |
| parent | 4577f3c6b60ea100e521c246fb169d6c05214b20 (diff) | |
| download | guix-patches-7097e98586df3110b80943a88c27804d65f214fa.tar guix-patches-7097e98586df3110b80943a88c27804d65f214fa.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/scripts/pull.scm')
| -rw-r--r-- | guix/scripts/pull.scm | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 7402782ff3..f01764637b 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -40,8 +40,6 @@ #:use-module (guix scripts build) #:use-module (guix scripts describe) #:autoload (guix build utils) (which mkdir-p) - #:use-module ((guix build syscalls) - #:select (with-file-lock/no-wait)) #:use-module (guix git) #:use-module (git) #:autoload (gnu packages) (fold-available-packages) @@ -119,11 +117,12 @@ Download and deploy the latest version of Guix.\n")) (display (G_ " -v, --verbosity=LEVEL use the given verbosity LEVEL")) (display (G_ " - -s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\"")) - (display (G_ " --bootstrap use the bootstrap Guile to build the new Guix")) (newline) (show-build-options-help) + (newline) + (show-native-build-options-help) + (newline) (display (G_ " -h, --help display this help and exit")) (display (G_ " @@ -184,10 +183,6 @@ Download and deploy the latest version of Guix.\n")) (lambda (opt name arg result) (alist-cons 'profile (canonicalize-profile arg) result))) - (option '(#\s "system") #t #f - (lambda (opt name arg result) - (alist-cons 'system arg - (alist-delete 'system result eq?)))) (option '(#\n "dry-run") #f #f (lambda (opt name arg result) (alist-cons 'dry-run? #t result))) @@ -208,7 +203,8 @@ Download and deploy the latest version of Guix.\n")) (lambda args (show-version-and-exit "guix pull"))) - %standard-build-options)) + (append %standard-build-options + %standard-native-build-options))) (define (warn-about-backward-updates channel start commit relation) "Warn about non-forward updates of CHANNEL from START to COMMIT, without |