summaryrefslogtreecommitdiff
path: root/guix/build
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-06-27 23:04:48 +0200
committerLudovic Courtès <ludo@gnu.org>2014-06-27 23:04:48 +0200
commit6750877f46e684688075674c6e342895a24a52c9 (patch)
tree5c59e1144ec4f8c6ca51e62e1747f557b286b716 /guix/build
parent20b1d19e10a788768c67d0d8256527791ce579c8 (diff)
git-download: Support recursive clones.
* guix/git-download.scm (<git-reference>)[recursive?]: New field. (git-fetch): Add 'inputs' variable. Add it to the #:inputs argument of 'build-expression->derivation'. Augment builder with call to 'set-path-environment-variable', and pass #:recursive? to 'git-fetch'. * guix/build/git.scm (git-fetch): Add #:recursive? parameter. Pass --recursive when RECURSIVE? is true, and delete all the '.git' files.
Diffstat (limited to 'guix/build')
-rw-r--r--guix/build/git.scm33
1 files changed, 21 insertions, 12 deletions
diff --git a/guix/build/git.scm b/guix/build/git.scm
index 68b132265b..121f07a7fa 100644
--- a/guix/build/git.scm
+++ b/guix/build/git.scm
@@ -28,23 +28,32 @@
;;; Code:
(define* (git-fetch url commit directory
- #:key (git-command "git"))
+ #:key (git-command "git") recursive?)
"Fetch COMMIT from URL into DIRECTORY. COMMIT must be a valid Git commit
-identifier. Return #t on success, #f otherwise."
+identifier. When RECURSIVE? is true, all the sub-modules of URL are fetched,
+recursively. Return #t on success, #f otherwise."
;; Disable TLS certificate verification. The hash of the checkout is known
;; in advance anyway.
(setenv "GIT_SSL_NO_VERIFY" "true")
- (and (zero? (system* git-command "clone" url directory))
- (with-directory-excursion directory
- (system* git-command "tag" "-l")
- (and (zero? (system* git-command "checkout" commit))
- (begin
- ;; The contents of '.git' vary as a function of the current
- ;; status of the Git repo. Since we want a fixed output, this
- ;; directory needs to be taken out.
- (delete-file-recursively ".git")
- #t)))))
+ (let ((args `("clone" ,@(if recursive? '("--recursive") '())
+ ,url ,directory)))
+ (and (zero? (apply system* git-command args))
+ (with-directory-excursion directory
+ (system* git-command "tag" "-l")
+ (and (zero? (system* git-command "checkout" commit))
+ (begin
+ ;; The contents of '.git' vary as a function of the current
+ ;; status of the Git repo. Since we want a fixed output, this
+ ;; directory needs to be taken out.
+ (delete-file-recursively ".git")
+
+ (when recursive?
+ ;; In sub-modules, '.git' is a flat file, not a directory,
+ ;; so we can use 'find-files' here.
+ (for-each delete-file-recursively
+ (find-files directory "^\\.git$")))
+ #t))))))
;;; git.scm ends here