nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guix: Support authentication when fetching from SVN. 

* guix/svn-download.scm (<svn-reference>): Add fields for optional
credentials.
(svn-fetch): Pass credentials to build-side "svn-fetch".
* guix/build/svn.scm (svn-fetch): Pass optional credentials to svn
command.
This commit is contained in:
Ricardo Wurmus 2016-06-30 15:43:23 +02:00 committed by Ricardo Wurmus
parent 1095bd1db0
commit 140dd8f82c
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
guix/build/svn.scm
View File

@ -29,15 +29,22 @@
;;; Code: ;;; Code:
(define* (svn-fetch url revision directory (define* (svn-fetch url revision directory
#:key (svn-command "svn")) #:key (svn-command "svn")
(user-name #f)
(password #f))
"Fetch REVISION from URL into DIRECTORY. REVISION must be an integer, and a "Fetch REVISION from URL into DIRECTORY. REVISION must be an integer, and a
valid Subversion revision. Return #t on success, #f otherwise." valid Subversion revision. Return #t on success, #f otherwise."
(and (zero? (system* svn-command "checkout" "--non-interactive" (and (zero? (apply system* svn-command
"checkout" "--non-interactive"
;; Trust the server certificate. This is OK as we ;; Trust the server certificate. This is OK as we
;; verify the checksum later. This can be removed when ;; verify the checksum later. This can be removed when
;; ca-certificates package is added. ;; ca-certificates package is added.
"--trust-server-cert" "-r" (number->string revision) "--trust-server-cert" "-r" (number->string revision)
url directory)) `(,@(if (and user-name password)
(list (string-append "--username=" user-name)
(string-append "--password=" password))
'())
,url ,directory)))
(with-directory-excursion directory (with-directory-excursion directory
(begin (begin
;; The contents of '.svn' vary as a function of the current status ;; The contents of '.svn' vary as a function of the current status

8
guix/svn-download.scm
View File

@ -42,7 +42,9 @@
svn-reference make-svn-reference svn-reference make-svn-reference
svn-reference? svn-reference?
(url svn-reference-url) ; string (url svn-reference-url) ; string
(revision svn-reference-revision)) ; number (revision svn-reference-revision) ; number
(user-name svn-reference-user-name (default #f))
(password svn-reference-password (default #f)))
(define (subversion-package) (define (subversion-package)
"Return the default Subversion package." "Return the default Subversion package."
@ -62,7 +64,9 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f."
(svn-fetch '#$(svn-reference-url ref) (svn-fetch '#$(svn-reference-url ref)
'#$(svn-reference-revision ref) '#$(svn-reference-revision ref)
#$output #$output
#:svn-command (string-append #+svn "/bin/svn")))) #:svn-command (string-append #+svn "/bin/svn")
#:user-name #$(svn-reference-user-name ref)
#:password #$(svn-reference-password ref))))
(mlet %store-monad ((guile (package->derivation guile system))) (mlet %store-monad ((guile (package->derivation guile system)))
(gexp->derivation (or name "svn-checkout") build (gexp->derivation (or name "svn-checkout") build