mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 14:07:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

8
guix/scripts/pull.scm
View file

@ -27,6 +27,7 @@ (define-module (guix scripts pull)
#:use-module (guix derivations) #:use-module (guix derivations)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix grafts)
#:use-module (guix monads) #:use-module (guix monads)
#:use-module (guix scripts build) #:use-module (guix scripts build)
#:use-module ((guix build utils) #:use-module ((guix build utils)
@ -256,6 +257,7 @@ (define (use-le-certs? url)
(unless (assoc-ref opts 'dry-run?) ;XXX: not very useful (unless (assoc-ref opts 'dry-run?) ;XXX: not very useful
(with-store store (with-store store
(parameterize ((%graft? (assoc-ref opts 'graft?)))
(set-build-options-from-command-line store opts) (set-build-options-from-command-line store opts)
;; For reproducibility, always refer to the LE certificates when we ;; For reproducibility, always refer to the LE certificates when we
@ -276,13 +278,15 @@ (define (use-le-certs? url)
(G_ "Building from Git commit ~a...~%") (G_ "Building from Git commit ~a...~%")
commit) commit)
(parameterize ((%guile-for-build (parameterize ((%guile-for-build
(package-derivation store (package-derivation
store
(if (assoc-ref opts 'bootstrap?) (if (assoc-ref opts 'bootstrap?)
%bootstrap-guile %bootstrap-guile
(canonical-package guile-2.0))))) (canonical-package guile-2.0)))))
(run-with-store store (run-with-store store
(build-and-install checkout (config-directory) (build-and-install checkout (config-directory)
#:commit commit #:commit commit
#:verbose? (assoc-ref opts 'verbose?))))))))))) #:verbose?
(assoc-ref opts 'verbose?))))))))))))
;;; pull.scm ends here ;;; pull.scm ends here