futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pull: Honor '--no-grafts'.

Browse Source 
* guix/scripts/pull.scm (guix-pull): Parameterize %GRAFT? as a function
of OPTS.
This commit is contained in:
Ludovic Courtès 2017-08-01 23:38:07 +02:00
parent 3085b50200
commit c53fc48144
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
guix/scripts/pull.scm
View File

@ -27,6 +27,7 @@
#:use-module (guix derivations)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix grafts)
#:use-module (guix monads)
#:use-module (guix scripts build)
#:use-module ((guix build utils)
@ -256,33 +257,36 @@ certificates~%"))
(unless (assoc-ref opts 'dry-run?) ;XXX: not very useful
(with-store store
(set-build-options-from-command-line store opts)
(parameterize ((%graft? (assoc-ref opts 'graft?)))
(set-build-options-from-command-line store opts)
;; For reproducibility, always refer to the LE certificates when we
;; know we're talking to Savannah.
(when (use-le-certs? url)
(honor-lets-encrypt-certificates! store))
(format (current-error-port)
(G_ "Updating from Git repository at '~a'...~%")
url)
(let-values (((checkout commit)
(latest-repository-commit store url
#:ref ref
#:cache-directory cache)))
;; For reproducibility, always refer to the LE certificates when we
;; know we're talking to Savannah.
(when (use-le-certs? url)
(honor-lets-encrypt-certificates! store))
(format (current-error-port)
(G_ "Building from Git commit ~a...~%")
commit)
(parameterize ((%guile-for-build
(package-derivation store
(if (assoc-ref opts 'bootstrap?)
%bootstrap-guile
(canonical-package guile-2.0)))))
(run-with-store store
(build-and-install checkout (config-directory)
#:commit commit
#:verbose? (assoc-ref opts 'verbose?)))))))))))
(G_ "Updating from Git repository at '~a'...~%")
url)
(let-values (((checkout commit)
(latest-repository-commit store url
#:ref ref
#:cache-directory cache)))
(format (current-error-port)
(G_ "Building from Git commit ~a...~%")
commit)
(parameterize ((%guile-for-build
(package-derivation
store
(if (assoc-ref opts 'bootstrap?)
%bootstrap-guile
(canonical-package guile-2.0)))))
(run-with-store store
(build-and-install checkout (config-directory)
#:commit commit
#:verbose?
(assoc-ref opts 'verbose?))))))))))))
;;; pull.scm ends here