me
/
guix
Archived
1
0
Fork 0
Code

guix package: Add `--no-substitutes'. 

* guix/scripts/package.scm (%default-options): Add `substitutes?'.
  (show-help, %options): Add and document `--no-substitutes'.
  (guix-package): Call `set-build-options' to honor `substitutes?'.
master
Ludovic Courtès 2013-04-12 15:43:55 +02:00
parent fe0cff14f6
commit 3b82460576
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/guix.texi
View File

@ -570,6 +570,9 @@ Use @var{profile} instead of the user's default profile.
@itemx -n @itemx -n
Show what would be done without actually doing it. Show what would be done without actually doing it.
@item --no-substitutes
Build instead of resorting to pre-built substitutes.
@item --verbose @item --verbose
Produce verbose output. In particular, emit the environment's build log Produce verbose output. In particular, emit the environment's build log
on the standard error port. on the standard error port.

13
guix/scripts/package.scm
View File

@ -313,7 +313,8 @@ but ~a is available upstream~%")
(define %default-options (define %default-options
;; Alist of default option values. ;; Alist of default option values.
`((profile . ,%current-profile))) `((profile . ,%current-profile)
(substitutes? . #t)))
(define (show-help) (define (show-help)
(display (_ "Usage: guix package [OPTION]... PACKAGES... (display (_ "Usage: guix package [OPTION]... PACKAGES...
@ -334,6 +335,8 @@ Install, remove, or upgrade PACKAGES in a single transaction.\n"))
-p, --profile=PROFILE use PROFILE instead of the user's default profile")) -p, --profile=PROFILE use PROFILE instead of the user's default profile"))
(display (_ " (display (_ "
-n, --dry-run show what would be done without actually doing it")) -n, --dry-run show what would be done without actually doing it"))
(display (_ "
--no-substitutes build instead of resorting to pre-built substitutes"))
(display (_ " (display (_ "
--bootstrap use the bootstrap Guile to build the profile")) --bootstrap use the bootstrap Guile to build the profile"))
(display (_ " (display (_ "
@ -388,6 +391,10 @@ Install, remove, or upgrade PACKAGES in a single transaction.\n"))
(option '(#\n "dry-run") #f #f (option '(#\n "dry-run") #f #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'dry-run? #t result))) (alist-cons 'dry-run? #t result)))
(option '("no-substitutes") #f #f
(lambda (opt name arg result)
(alist-cons 'substitutes? #f
(alist-delete 'substitutes? result))))
(option '("bootstrap") #f #f (option '("bootstrap") #f #f
(lambda (opt name arg result) (lambda (opt name arg result)
(alist-cons 'bootstrap? #t result))) (alist-cons 'bootstrap? #t result)))
@ -750,6 +757,10 @@ Install, remove, or upgrade PACKAGES in a single transaction.\n"))
(or (process-query opts) (or (process-query opts)
(with-error-handling (with-error-handling
(parameterize ((%store (open-connection))) (parameterize ((%store (open-connection)))
(set-build-options (%store)
#:use-substitutes?
(assoc-ref opts 'substitutes?))
(parameterize ((%guile-for-build (parameterize ((%guile-for-build
(package-derivation (%store) (package-derivation (%store)
(if (assoc-ref opts 'bootstrap?) (if (assoc-ref opts 'bootstrap?)