diff options
| -rw-r--r-- | guix/svn-download.scm | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/guix/svn-download.scm b/guix/svn-download.scm index 17a7f4f957..bdd9c39eb5 100644 --- a/guix/svn-download.scm +++ b/guix/svn-download.scm @@ -90,6 +90,12 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (define guile-gnutls (module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls)) + (define tar+gzip ;for (guix swh) + (list (module-ref (resolve-interface '(gnu packages compression)) + 'gzip) + (module-ref (resolve-interface '(gnu packages base)) + 'tar))) + (define build (with-imported-modules (source-module-closure '((guix build svn) @@ -104,9 +110,14 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." ((guix build download) #:select (download-method-enabled?)) (guix build download-nar) + (guix build utils) (guix swh) (ice-9 match)) + ;; Add tar and gzip to $PATH so + ;; 'swh-download-directory-by-nar-hash' can invoke them. + (set-path-environment-variable "PATH" '("bin") '(#+@tar+gzip)) + (or (and (download-method-enabled? 'upstream) (svn-fetch (getenv "svn url") (string->number (getenv "svn revision")) @@ -185,6 +196,12 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (define guile-gnutls (module-ref (resolve-interface '(gnu packages tls)) 'guile-gnutls)) + (define tar+gzip ;for (guix swh) + (list (module-ref (resolve-interface '(gnu packages compression)) + 'gzip) + (module-ref (resolve-interface '(gnu packages base)) + 'tar))) + (define build (with-imported-modules (source-module-closure '((guix build svn) @@ -204,6 +221,10 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." (srfi srfi-1) (ice-9 match)) + ;; Add tar and gzip to $PATH so + ;; 'swh-download-directory-by-nar-hash' can invoke them. + (set-path-environment-variable "PATH" '("bin") '(#+@tar+gzip)) + (or (every (lambda (location) ;; The directory must exist if we are to fetch only a |